diff --git a/install-VS2015.bat b/install-VS2015.bat
new file mode 100644
index 000000000..70efd3d97
--- /dev/null
+++ b/install-VS2015.bat
@@ -0,0 +1,16 @@
+@REM Delete so if builder fails it wont exist
+del source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.*
+
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "source\Builder.sln" /nologo /maxcpucount /p:Configuration=Debug /p:Platform=x86
+
+@if not exist source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe goto error
+
+start source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe -bat -VS2015 %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+@exit
+
+:Error
+@echo _
+@echo _
+@echo Something went wrong.
+@pause
\ No newline at end of file
diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
index 089303c12..c27cacbec 100644
--- a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
+++ b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -62,6 +62,10 @@
     <NoWin32Manifest>true</NoWin32Manifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Interop.TaskScheduler">
+      <HintPath>.\Interop.TaskScheduler.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -131,17 +135,6 @@
   <ItemGroup>
     <Resource Include="Cosmos.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="TaskScheduler">
-      <Guid>{E34CB9F1-C7F7-424C-BE29-027DCC09363A}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
index 166b3ad67..aa0c13142 100644
--- a/source/Cosmos.Build.Builder/CosmosTask.cs
+++ b/source/Cosmos.Build.Builder/CosmosTask.cs
@@ -267,8 +267,10 @@ namespace Cosmos.Build.Builder {
           break;
         case VsVersion.Vs2015:
           CheckVs2015();
-          CheckForInstall("Microsoft Visual Studio 2015 RC SDK", true);
+          CheckForInstall("Microsoft Visual Studio 2015 SDK - ENU", true);
           break;
+        default:
+          throw new NotImplementedException();
       }
 
       //works also without, only close of VMWare is not working! CheckNet35Sp1(); // Required by VMWareLib
diff --git a/source/Cosmos.Build.Builder/Interop.TaskScheduler.dll b/source/Cosmos.Build.Builder/Interop.TaskScheduler.dll
new file mode 100644
index 000000000..1bc5d8223
Binary files /dev/null and b/source/Cosmos.Build.Builder/Interop.TaskScheduler.dll differ