-One approach to using cloud resources to run HTCondor jobs is to use the =condor_annex= tool to expand an existing pool onto the cloud (see HowToUseCondorAnnexWithOnDemandInstances).  Another approach, documented here, is to create a new HTCondor pool entirely in the cloud.  The HTCondor team maintains an AWS Marketplace entry to help simplify the process.  These instructions assume you already have an AWS account and some experience using HTCondor; it will also help to have some experience using AWS and SSH.  You will also need an EC2 key pair; if you don't already have one, see section 5.1.
+One approach to using cloud resources to run HTCondor jobs is to use the =condor_annex= tool to expand an existing pool onto the cloud (see HowToUseCondorAnnexWithOnDemandInstances).  Another approach, documented here, is to create a new HTCondor pool entirely in the cloud.  Although this approach doesn't allow jobs already in a queue to run on cloud resources, it has the advantage that all file-transfer between the queue and the execute nodes occurs within the cloud, which could lead to substantial performance improvements and cost reductions.
 
-Although this approach doesn't allow jobs already in a queue to run on cloud resources, it has the advantage that all file-transfer between the queue and the execute nodes occurs within the cloud, which could lead to substantial performance improvements and cost reductions.
+The HTCondor team maintains an AWS Marketplace entry to help simplify the process of creating an HTCondor pool at Amazon.
+
+To follow these instructions you must already have an AWS account.
 
 {section: Overview}
 
 The general approach will be to use the Marketplace entry to start a _head node_, which will be the brains of the new HTCondor pool, as well as be where you'll log in to and submit jobs from.  Once the head node is up and running, you'll use =condor_annex= to add cloud resources to your new pool.  Then you can start running jobs, and when they're done, shut everything down.
 
+0: Log into AWS
 1: Start a Head Node
+1.1:: Create a Key Pair
+1.2:: Start a Head Node
 2: Add Cloud Resources to Your New Pool
 2:: Log into your Head Node
 2:: Obtain an Access Key
@@ -16,13 +21,28 @@
 4: Clean Up
 4:: The Cloud Resources
 4:: The Head Node
-5: Appendix
-5:: Obtain an EC2 Key Pair
+
+{section: 0 Log into AWS}
+
+The first step is to log in to {link: https://console.aws.amazon.com/ec2/home?#KeyPairs:sort=keyName AWS}.
 
 {section: 1 Start a Head Node}
 
+Every head node needs an address and, for security, a key.  AWS will automatically provide the address, but you need to do a little work to specify the key.  For technical reasons, AWS refers to these as key pairs.  If you already have one (if, for instance, you're following these instructions a second time), you can skip to section 1.2, but creating another key pair won't cause problems.
+
+{subsection: 1.1 Create a Key Pair}
+
+1: Go to the {link: https://console.aws.amazon.com/ec2/home?#KeyPairs:sort=keyName EC2 key pair console}.
+1: Click the blue "Create Key Pair" button in the upper left.
+1: Enter a name; "HTCondorKeyPair" would be fine.  Click the blue "Create" button.
+1: Your browser will probably bring up a dialog box asking you what to do with "HTCondorKeyPair.pem".  (It may just start saving it for you.)  Save it some place you won't accidentally delete it and make a note of the location.
+
+When you later connect to your head node, you'll need to know the location so you can specify the file.
+
+{subsection: 1.2 Start a Head Node}
+
 1: Open HTCondor's {link: https://aws.amazon.com/marketplace/pp/B073WHVRPR Marketplace entry} in another tab.
-1: Click the orange 'Continue' button to the right.  You may need to log in to AWS at this point.
+1: Click the orange 'Continue' button to the right.
 1: This is a busy page, but there's only one thing you may have to change: the "key pair" setting, which is all the way down at the bottom.  Change the selected key pair, if necessary, to be one whose private half you have.
 1: This step is where you will start spending money.  Scroll back up; there will be section to the right titled "Price for your Selections."  That's what Amazon will charge starting when you click the orange 'Launch with one-click' button.  We'll remind you in these instructions, but you'll have to stop or terminate the instance your about to start on your own.
 1: On the next page, click on the "Your Software" link in the green box.
@@ -155,18 +175,3 @@
 {subsection: 4.2 The Head Node}
 
 As noted above, you'll need to clean the head node up yourself.  If you don't want to keep any of your changes, then you should "terminate" the head node to avoid paying for storage.  If you just want to save money and pick up where you left off a bit later, you should instead "stop" the head node; you'll pay to keep its disk around until you start the head node again later.  Both options are under "Instance State" if you right-click on the instance in the EC2 console.
-
-----
-
-{section: 5 Appendix}
-
-{subsection: 5.1 Obtain a Key Pair}
-
-You need an EC2 key pair in order to connect (SSH) to your head node.
-
-1: Go to the {link: https://console.aws.amazon.com/ec2/home?region=us-east-1#KeyPairs:sort=keyName EC2 key pair console}.
-1: Click the blue "Create Key Pair" button in the upper left.
-1: Enter a name; "HTCondorKeyPair" would be fine.  Click the blue "Create" button.
-1: Your browser will probably bring up a dialog box asking you what to do with "HTCondorKeyPair.pem".  (It may just start saving it for you.)  Save it some place you won't accidentally delete it and make a note of the location.
-
-When you later use SSH to connect to your head node, you'll need to know the location so you can specify the file.