diff --git a/PythonClient/imitation_learning/README.md b/PythonClient/imitation_learning/README.md
index df0c563a3..c8c769156 100644
--- a/PythonClient/imitation_learning/README.md
+++ b/PythonClient/imitation_learning/README.md
@@ -6,7 +6,7 @@ The code in this section is based on the [Autonomous Driving Cookbook](https://g
 ## Prerequisites  
 * Operating system: Windows 10  
 * GPU: Nvidia GTX 1080 or higher (recommended)  
-* Software: Unreal Engine 4.24 and Visual Studio 2017 (see [upgrade instructions](../../docs/unreal_upgrade.md))  
+* Software: Unreal Engine 4.24 and Visual Studio 2019 (see [upgrade instructions](../../docs/unreal_upgrade.md))  
 * Development: CUDA 9.0 and python 3.5.  
 * Python libraries: Keras 2.1.2, TensorFlow 1.6.0.  
 * Note: Newer versions of keras or tensorflow are recommended but can cause syntax errors.  
diff --git a/build.cmd b/build.cmd
index 8a6d76cca..2b7e4b663 100644
--- a/build.cmd
+++ b/build.cmd
@@ -8,14 +8,14 @@ set "noFullPolyCar="
 set "buildMode="
 
 REM //check VS version
-if "%VisualStudioVersion%"=="" (
+if "%VisualStudioVersion%" == "" (
     echo(
-    echo oh oh... You need to run this command from x64 Native Tools Command Prompt for VS 2017.
+    echo oh oh... You need to run this command from x64 Native Tools Command Prompt for VS 2019.
     goto :buildfailed_nomsg
 )
-if "%VisualStudioVersion%"=="14.0" (
+if "%VisualStudioVersion%" lss "16.0" (
     echo(
-    echo Hello there! We just upgraded AirSim to Unreal Engine 4.24 and Visual Studio 2017.
+    echo Hello there! We just upgraded AirSim to Unreal Engine 4.24 and Visual Studio 2019.
     echo Here are few easy steps for upgrade so everything is new and shiny:
     echo https://github.com/Microsoft/AirSim/blob/master/docs/unreal_upgrade.md
     goto :buildfailed_nomsg
diff --git a/docs/Unity.md b/docs/Unity.md
index 1c42e1d30..3b16cc301 100644
--- a/docs/Unity.md
+++ b/docs/Unity.md
@@ -15,16 +15,16 @@ This project is still in early development, expect some rough edges. We are work
 * Note: If you are using Unity for the first time, check out [the Getting started guide](https://docs.unity3d.com/Manual/GettingStarted.html). The [Unity User Manual](https://docs.unity3d.com/Manual/UnityManual.html) has additional tips, resources, and FAQs.
 
 #### Build Airsim
-* Install Visual Studio 2017. 
-**Make sure** to select **VC++** and **Windows SDK 8.1** while installing VS 2017.   
+* Install Visual Studio 2019. 
+**Make sure** to select **Desktop Development with C++** and **Windows 10 SDK 10.0.18362** (should be selected by default) while installing VS 2019. 
 
-* Start `x64 Native Tools Command Prompt for VS 2017`. 
+* Start `x64 Native Tools Command Prompt for VS 2019`. 
 * Clone the repo: `git clone https://github.com/Microsoft/AirSim.git`, and go the AirSim directory by `cd AirSim`. 
 * Run `build.cmd` from the command line. 
 
 #### Build Unity Project
 * Go inside the AirSim\Unity directory: `cd Unity`. 
-* Build the unity project: `build.cmd`.   
+* Build the unity project: `build.cmd`. 
 * Additionally, there is a free environment `Windridge City` which you can download from [Unity Asset Store](https://assetstore.unity.com/packages/3d/environments/roadways/windridge-city-132222). And, of course, you can always create your own environment.
 
 ## Linux
diff --git a/docs/dev_workflow.md b/docs/dev_workflow.md
index f10cacc22..b03f05f67 100644
--- a/docs/dev_workflow.md
+++ b/docs/dev_workflow.md
@@ -4,7 +4,7 @@ Below is the guide on how to perform different development activities while work
 
 ## Development Environment
 ### OS
-We highly recommend Windows 10 and Visual Studio 2017 as your development environment. The support for other OSes and IDE is unfortunately not as mature on the Unreal Engine side and you may risk severe loss of productivity trying to do workarounds and jumping through the hoops.
+We highly recommend Windows 10 and Visual Studio 2019 as your development environment. The support for other OSes and IDE is unfortunately not as mature on the Unreal Engine side and you may risk severe loss of productivity trying to do workarounds and jumping through the hoops.
 
 ### Hardware
 We recommend GPUs such as NVidia 1080 or NVidia Titan series with powerful desktop such as one with 64GB RAM, 6+ cores, SSDs and 2-3 displays (ideally 4K). We have found HP Z840 work quite well for our needs. The development experience on high-end laptops is generally sub-par compared to powerful desktops however they might be useful in a pinch. You generally want laptops with discrete NVidia GPU (at least M2000 or better) with 64GB RAM, SSDs and hopefully 4K display. We have found models such as Lenovo P50 work well for our needs. Laptops with only integrated graphics might not work well.
@@ -20,7 +20,7 @@ The first step is accomplished by build.cmd available in AirSim root. This comma
 Below are the steps we use to make changes in AirSim and test them out. The best way to do development in AirSim code is to use [Blocks project](unreal_blocks.md). This is the light weight project so compile time is relatively faster. Generally the workflow is,
 
 ```
-REM //Use x64 Native Tools Command Prompt for VS 2017
+REM //Use x64 Native Tools Command Prompt for VS 2019
 REM //Navigate to AirSim repo folder
 
 git pull                          
@@ -36,7 +36,7 @@ After you are done with you code changes, you might want to push your changes ba
 
 
 ```
-REM //Use x64 Native Tools Command Prompt for VS 2017
+REM //Use x64 Native Tools Command Prompt for VS 2019
 REM //run this from Unreal\Environments\Blocks 
 
 update_to_git.bat
diff --git a/docs/unreal_blocks.md b/docs/unreal_blocks.md
index 746a24816..4a4f6795b 100644
--- a/docs/unreal_blocks.md
+++ b/docs/unreal_blocks.md
@@ -9,7 +9,7 @@ Here are quick steps to get Blocks environment up and running:
 
 1. Make sure you have [installed Unreal and built AirSim](build_windows.md).
 2. Navigate to folder `AirSim\Unreal\Environments\Blocks` and run `update_from_git.bat`.
-3. Double click on generated .sln file to open in Visual Studio 2017 or newer.
+3. Double click on generated .sln file to open in Visual Studio 2019 or newer.
 4. Make sure `Blocks` project is the startup project, build configuration is set to `DebugGame_Editor` and `Win64`. Hit F5 to run.
 5. Press the Play button in Unreal Editor and you will see something like in below video. Also see [how to use AirSim](https://github.com/Microsoft/AirSim/#how-to-use-it).
 
diff --git a/docs/unreal_upgrade.md b/docs/unreal_upgrade.md
index ae478cb9d..b05014221 100644
--- a/docs/unreal_upgrade.md
+++ b/docs/unreal_upgrade.md
@@ -7,9 +7,9 @@ These instructions apply if you are already using AirSim on Unreal Engine 4.16.
 ## Do this first
 
 ### For Windows Users
-1. Install Visual Studio 2017 with VC++, Python and C#.
+1. Install Visual Studio 2019 with VC++, Python and C#.
 2. Install UE 4.24 through Epic Games Launcher.
-3. Start `x64 Native Tools Command Prompt for VS 2017` and navigate to AirSim repo.
+3. Start `x64 Native Tools Command Prompt for VS 2019` and navigate to AirSim repo.
 4. Run `clean_rebuild.bat` to remove all unchecked/extra stuff and rebuild everything.
 
 ### For Linux Users