diff --git a/Data/AI/FlightPlans/KSFO_depart_south_28L.xml b/Data/AI/FlightPlans/KSFO_depart_south_28L.xml
new file mode 100644
index 000000000..61045527b
--- /dev/null
+++ b/Data/AI/FlightPlans/KSFO_depart_south_28L.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+
+<!-- Based on the Porte departure at KSFO, left turnout to WAGES                  
+     The departure can be found at http://www.airnav.com/airport/KSFO 
+     Format:                                                         
+       <name>       Waypoint name.  When a waypoint named END is reached
+                    the AI airplane will delete itself.                                       
+       <lat>        latitude, degrees (-90 to 90)                                    
+       <lon>        Longitude, degrees (-180 to 180)                                   
+       <alt>        altitude above sea level, feet                                       
+       <crossat>    Crossing altitude, feet                              
+       <ktas>       Knots true airspeed
+       <on-ground>  set true if on the ground
+       <gear-down>  set true for gear down, false for gear up
+       <flaps-down> set true for flaps down, false for flaps up
+-->
+ 
+<PropertyList>
+
+ <flightplan>
+
+  <wpt>
+   <name>28L</name>
+   <lat>37.611716</lat>
+   <lon>-122.358434</lon>
+   <alt>13.0</alt>
+   <ktas>20</ktas>
+   <on-ground>true</on-ground>
+   <gear-down>true</gear-down>
+  </wpt>
+
+  <wpt>
+   <name>accel</name>
+   <lat>37.611772</lat>
+   <lon>-122.358569</lon>
+   <alt>13.0</alt>
+   <ktas>150</ktas>
+   <on-ground>true</on-ground>
+  </wpt>
+
+  <wpt>
+   <name>rotate</name>
+   <lat>37.617969</lat>
+   <lon>-122.37327</lon>
+   <alt>30000.0</alt>
+   <ktas>200</ktas>
+   <gear-down>false</gear-down>
+  </wpt>
+
+  <wpt>
+   <name>runway-end</name>
+   <lat>37.625241</lat>
+   <lon>-122.390523</lon>
+   <alt>30000.0</alt>
+   <ktas>240</ktas>
+  </wpt>
+
+  <wpt>
+   <name>first_fix</name> 
+   <lat>37.608134</lat>
+   <lon>-122.460712</lon>
+   <alt>30000.0</alt>
+   <ktas>270</ktas>
+  </wpt>
+
+  <wpt>
+   <name>second_fix</name>  
+   <lat>37.527346</lat>
+   <lon>-122.47883</lon>
+   <alt>30000.0</alt>
+   <ktas>320</ktas>
+  </wpt>
+
+  <wpt>
+   <name>PESCA</name>  
+   <lat>37.2681667</lat>
+   <lon>-122.3286667</lon>
+   <alt>30000.0</alt>
+   <ktas>370</ktas>
+  </wpt>
+
+  <wpt>
+   <name>END</name>   <!-- WAGES intersection, OSI 116/36, 113.9  -->  
+   <lat>36.991</lat>
+   <lon>-121.737</lon>
+  </wpt>
+
+  <wpt>
+   <name>EOF</name>
+  </wpt>
+
+ </flightplan>
+
+</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/default_scenario.xml b/Data/AI/aircraft_demo.xml
similarity index 51%
rename from Data/AI/default_scenario.xml
rename to Data/AI/aircraft_demo.xml
index a9562d105..3df70be59 100644
--- a/Data/AI/default_scenario.xml
+++ b/Data/AI/aircraft_demo.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
- 
+
 <PropertyList>
 
  <scenario>
 
   <entry>
-   <callsign>United 721</callsign>
-   <class>JET_TRANSPORT</class>
+   <callsign>United 720</callsign>
+   <type>aircraft</type>
+   <class>jet_transport</class>
    <model>Aircraft/737/Models/boeing733.xml</model>
-   <flightplan>KSFO_modesto28R.xml</flightplan>
+   <flightplan>KSFO_depart_south_28L.xml</flightplan>
   </entry>
 
  </scenario>
diff --git a/Data/AI/ballistic_demo.xml b/Data/AI/ballistic_demo.xml
new file mode 100644
index 000000000..609aa106e
--- /dev/null
+++ b/Data/AI/ballistic_demo.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+ 
+<PropertyList>
+
+ <scenario>
+
+  <entry>
+   <type>ballistic</type>
+   <path>Models/Geometry/rocket.xml</path>
+   <speed type="double">500.0</speed>
+   <altitude type="double">50.0</altitude>
+   <longitude type="double">-122.39</longitude>
+   <latitude type="double">37.62</latitude>
+   <heading type="double">200.0</heading>
+   <azimuth type="double">70.0</azimuth>
+   <elevation type="double">45.0</elevation>
+  </entry>
+
+ </scenario>
+
+</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/demo_scenario.xml b/Data/AI/demo_scenario.xml
deleted file mode 100644
index 831555093..000000000
--- a/Data/AI/demo_scenario.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
- 
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <callsign>United 720</callsign>
-   <type>aircraft</type>
-   <class>jet_transport</class>
-   <model>Aircraft/737/Models/boeing733.xml</model>
-   <flightplan>KSFO_ILS28L.xml</flightplan>
-  </entry>
-
-  <entry>
-   <callsign>United 721</callsign>
-   <type>aircraft</type>
-   <class>jet_transport</class>
-   <model>Aircraft/737/Models/boeing733.xml</model>
-   <flightplan>KSFO_depart_east_01R.xml</flightplan>
-  </entry>
-
-  <entry>
-   <callsign>United 722</callsign>
-   <type>aircraft</type>
-   <class>jet_transport</class>
-   <model>Aircraft/737/Models/boeing733.xml</model>
-   <flightplan>KSFO_depart_south_01L.xml</flightplan>
-  </entry>
-
-  <entry>
-   <type>ship</type>
-   <model>Models/Geometry/sailboat.xml</model>
-   <latitude>37.63</latitude>
-   <longitude>-122.34</longitude>
-   <speed>6.0</speed>
-   <rudder>3.0</rudder>
-  </entry>
-
-  <entry>
-   <type>storm</type>
-   <model>Models/Geometry/thunderstorm.xml</model>
-   <latitude>37.3917</latitude>
-   <longitude>-122.2817</longitude>
-   <speed>25.0</speed>
-   <altitude>4000.0</altitude>
-   <heading>70.0</heading>
-  </entry>
-
-
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/ship_demo.xml b/Data/AI/ship_demo.xml
new file mode 100644
index 000000000..f7529e086
--- /dev/null
+++ b/Data/AI/ship_demo.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <scenario>
+
+  <!-- Puts a sailboat in the bay just east of KSFO -->
+  <entry>
+   <type>ship</type>
+   <model>Models/Geometry/sailboat.xml</model>
+   <latitude>37.63</latitude>
+   <longitude>-122.34</longitude>
+   <speed>6.0</speed>
+   <rudder>3.0</rudder>
+  </entry>
+
+ </scenario>
+
+</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/thunderstorm_demo.xml b/Data/AI/thunderstorm_demo.xml
new file mode 100644
index 000000000..81ada162c
--- /dev/null
+++ b/Data/AI/thunderstorm_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <scenario>
+
+  <!-- Puts a thunderstorm southwest of KSFO -->
+  <entry>
+   <type>storm</type>
+   <model>Models/Geometry/thunderstorm.xml</model>
+   <latitude>37.44</latitude>
+   <longitude>-122.25</longitude>
+   <speed>25.0</speed>
+   <altitude>4000.0</altitude>
+   <heading>70.0</heading>
+  </entry>
+
+ </scenario>
+
+</PropertyList>
\ No newline at end of file