diff --git a/start/ns-setup-win.md b/start/ns-setup-win.md
index 2b1ce6204..a0b68516a 100644
--- a/start/ns-setup-win.md
+++ b/start/ns-setup-win.md
@@ -25,7 +25,7 @@ This page contains a list of all system requirements needed to build and run Nat
 * Android SDK 22 or a later stable official release
 * Local Maven repository for Support Libraries
 * Android SDK Build-tools 25.0.2 or a later stable official release
-* (Optional) Genymotion to expand your testing options
+* Set up Android virtual devices to expand your testing options
 
 You must also have the following two environment variables setup for Android development, which will automatically be added for you as part of the installation:
 
@@ -37,53 +37,54 @@ You must also have the following two environment variables setup for Android dev
 Complete the following steps to set up NativeScript on your Windows development machine:
 
 1. Install [Chocolatey](https://chocolatey.org) to simplify the installation and configuration of the Android tools and SDKs.
-    1. Run the command prompt as an Administrator.
-    1. Copy and paste the following script in the command prompt.
+    - Run the command prompt as an Administrator.
+    - Copy and paste the following script in the command prompt.
 
         <pre class="add-copy-button"><code class="language-terminal">@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
         </code></pre>
-    1. Restart the command prompt.
+    - Restart the command prompt.
 
-1. Install the latest Node.js [6.x](https://nodejs.org/dist/latest-v6.x/) or [7.x](https://nodejs.org/dist/latest-v7.x/) stable official release. We recommend using Node.js v4.x.
+2. Install the latest Node.js [6.x](https://nodejs.org/dist/latest-v6.x/) or [7.x](https://nodejs.org/dist/latest-v7.x/) stable official release. We recommend using Node.js v4.x.
 
-    1. In the command prompt, run the following command.
+    - In the command prompt, run the following command.
 
         <pre class="add-copy-button"><code class="language-terminal">choco install nodejs -y -version 6.9.1
         </code></pre>
 
-1. Install [JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or a later stable official release.
-    1. In the command prompt, run the following command.
+3. Install [JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or a later stable official release.
+    - In the command prompt, run the following command.
 
         <pre class="add-copy-button"><code class="language-terminal">choco install jdk8 -y
         </code></pre>
 
-1. Install the [Android SDK](http://developer.android.com/sdk/index.html).
-    1. In the command prompt, run the following command.
+4. Install the [Android SDK](http://developer.android.com/sdk/index.html).
+    - In the command prompt, run the following command.
 
         <pre class="add-copy-button"><code class="language-terminal">choco install android-sdk -y
         </code></pre>
 
-    1. Restart the command prompt.
+    - Restart the command prompt.
 
-1. Install the required Android SDKs and the Local Maven repository for Support Libraries.
+5. Install the required Android SDKs and the Local Maven repository for Support Libraries.
 
     <pre class="add-copy-button"><code class="language-terminal">echo yes | "%ANDROID_HOME%\tools\android" update sdk --filter tools,platform-tools,android-23,build-tools-23.0.3,extra-android-m2repository,extra-google-m2repository,extra-android-support --all --no-ui
     </code></pre>
 
-1. (Optional) Install Genymotion.<br/>Genymotion is a third-party native emulator.
-    1. Go to [Get Genymotion](https://www.genymotion.com/#!/download), select Windows and click **Get Genymotion**.<br/>You might want to download the larger archive which contains VirtualBox.
-    1. If prompted, confirm the download.
-    1. After the download completes, run the installer and complete the installation.
+6. Install Android virtual devices (AVDs)
+    - Go to [Setup Android emulators](https://docs.nativescript.org/tooling/android-virtual-devices) 
+    - Follow the steps to create and start AVD with enabled HAXM.
 
-1. Install the NativeScript CLI.
-    1. Run the following command.
+    Alternativly a Visual Studio emulator for Android can be used, More information [here](https://www.visualstudio.com/vs/msft-android-emulator/)
+
+7. Install the NativeScript CLI.
+    - Run the following command.
 
         <pre class="add-copy-button"><code class="language-terminal">npm i -g nativescript
         </code></pre>
 
-    1. Restart the command prompt.
+    - Restart the command prompt.
 
-1. To check if your system is configured properly, run the following command.
+8. To check if your system is configured properly, run the following command.
 
     <pre class="add-copy-button"><code class="language-terminal">tns doctor
     </code></pre>