diff --git a/Unreal/Environments/Blocks/update_from_git_ci.bat b/Unreal/Environments/Blocks/update_from_git_ci.bat
new file mode 100644
index 000000000..58c565c83
--- /dev/null
+++ b/Unreal/Environments/Blocks/update_from_git_ci.bat
@@ -0,0 +1,34 @@
+@echo off
+REM //---------- set up variable ----------
+setlocal
+set ROOT_DIR=%~dp0
+
+set AirSimPath=%1
+
+REM default path works for Blocks environment
+if "%AirSimPath%"=="" set "AirSimPath=..\..\.."
+
+IF NOT EXIST "%AirSimPath%" (
+	echo "AirSimPath %AirSimPath% was not found"
+	goto :failed
+)
+
+echo Using AirSimPath = %AirSimPath%
+
+robocopy /MIR "%AirSimPath%\Unreal\Plugins\AirSim" Plugins\AirSim /XD temp *. /njh /njs /ndl /np
+robocopy /MIR "%AirSimPath%\AirLib" Plugins\AirSim\Source\AirLib /XD temp *. /njh /njs /ndl /np
+robocopy  /njh /njs /ndl /np "%AirSimPath%\Unreal\Environments\Blocks" "." *.bat 
+robocopy  /njh /njs /ndl /np "%AirSimPath%\Unreal\Environments\Blocks" "." *.sh  
+rem robocopy /njh /njs /ndl /np "%AirSimPath%" "." *.gitignore
+
+REM cmd /c clean.bat
+REM cmd /c GenerateProjectFiles.bat
+
+goto :done
+
+:failed
+echo Error occured while updating.
+exit /b 1
+
+:done
+REM if "%1"=="" pause
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
index 2b7e4b663..b1ccd9562 100644
--- a/build.cmd
+++ b/build.cmd
@@ -157,15 +157,15 @@ IF NOT EXIST AirLib\deps\eigen3 goto :buildfailed
 
 REM //---------- now we have all dependencies to compile AirSim.sln which will also compile MavLinkCom ----------
 if "%buildMode%" == "--Debug" (
-msbuild /p:Platform=x64 /p:Configuration=Debug AirSim.sln
+msbuild -maxcpucount:12 /p:Platform=x64 /p:Configuration=Debug AirSim.sln
 if ERRORLEVEL 1 goto :buildfailed
 ) else if "%buildMode%" == "--Release" (
-msbuild /p:Platform=x64 /p:Configuration=Release AirSim.sln
+msbuild -maxcpucount:12 /p:Platform=x64 /p:Configuration=Release AirSim.sln
 if ERRORLEVEL 1 goto :buildfailed
 ) else (
-msbuild /p:Platform=x64 /p:Configuration=Debug AirSim.sln
+msbuild -maxcpucount:12 /p:Platform=x64 /p:Configuration=Debug AirSim.sln
 if ERRORLEVEL 1 goto :buildfailed
-msbuild /p:Platform=x64 /p:Configuration=Release AirSim.sln 
+msbuild -maxcpucount:12 /p:Platform=x64 /p:Configuration=Release AirSim.sln 
 if ERRORLEVEL 1 goto :buildfailed
 )
 
diff --git a/pipelines/ci.yml b/pipelines/ci.yml
index 9df12eb6b..02d9bfa6b 100644
--- a/pipelines/ci.yml
+++ b/pipelines/ci.yml
@@ -95,9 +95,9 @@ stages:
 
           - script: |
               call "C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
-              call .\update_from_git.bat
+              call .\update_from_git_ci.bat
             workingDirectory: Unreal/Environments/Blocks
-            displayName: Copy AirLib to Blocks (update_from_git.bat)
+            displayName: Copy AirLib to Blocks (update_from_git_ci.bat)
 
           # Build Blocks
           - script: |