diff --git a/user/downloading-installing-upgrading/installation-guide.md b/user/downloading-installing-upgrading/installation-guide.md
index 55d7e2cc..6dd2e1f0 100644
--- a/user/downloading-installing-upgrading/installation-guide.md
+++ b/user/downloading-installing-upgrading/installation-guide.md
@@ -63,9 +63,11 @@ Advanced tab, you might find them under the Security tab.
   OS needs to be able to manage the hardware directly.
 </div>
 
-### Copying the ISO onto the installation medium
+### Installation medium preparation
 
-Start by [downloading](/downloads/) a Qubes ISO.
+Pick the most secure existing computer and OS you have available for
+downloading and copying the Qubes ISO onto the installation medium.
+[Download](/downloads/) a Qubes ISO.
 
 <div class="alert alert-danger" role="alert">
   <i class="fa fa-exclamation-triangle"></i>
@@ -95,8 +97,10 @@ or a USB drive. The size of each Qubes ISO is available on the
   modifying any devices.
 </div>
 
-If you choose to use a USB drive, copy the ISO onto the USB device, e.g. using
-`dd`:
+#### Linux ISO to USB
+
+On Linux, if you choose to use a USB drive, copy the ISO onto the USB device,
+e.g. using `dd`:
 
 ```
 $ sudo dd if=Qubes-RX-x86_64.iso of=/dev/sdY status=progress bs=1048576 && sync
@@ -107,29 +111,25 @@ and change `/dev/sdY` to the correct target device e.g., `/dev/sdc`). Make sure
 to write to the entire device (e.g., `/dev/sdc`) rather than just a single
 partition (e.g., `/dev/sdc1`).
 
-On Windows, you can use the [Rufus](https://rufus.akeo.ie/) tool to write the
-ISO to a USB key. MediaTest is not recommended. Be sure to select "DD image"
-mode (*after* selecting the Qubes ISO):
+#### Windows ISO to USB
 
-<div class="alert alert-warning" role="alert">
-  <i class="fa fa-exclamation-circle"></i>
-  <b>Note:</b>  If you do this on Windows 10, you can only install Qubes
-  without MediaTest, which is not recommended.
-</div>
+On Windows, you can use the [Rufus](https://rufus.akeo.ie/) tool to write the
+ISO to a USB key. Be sure to select "Write in DD Image mode" *after* selecting
+the Qubes ISO:
 
 ![Rufus menu](/attachment/doc/rufus-menu.png)
 
 ![Rufus DD image mode](/attachment/doc/rufus-dd-image-mode.png)
 
-If you are an advanced user, and you would like to customize your installation,
-please see [custom installation](/doc/custom-install/). Otherwise, follow the
-instructions below.
-
 ## Installation
 
 This section will demonstrate a simple installation using mostly default
 settings.
 
+If you are an advanced user, and you would like to customize your installation,
+please see [custom installation](/doc/custom-install/). Otherwise, follow the
+instructions below.
+
 ### Getting to the boot screen
 
 Just after you power on your machine, make the Qubes OS medium available to the