From a07b90cdf9e4def900c8d31ee8336166676fdebe Mon Sep 17 00:00:00 2001
From: david <david>
Date: Mon, 11 Nov 2002 17:30:09 +0000
Subject: [PATCH] Introduced a new alias arrangement, using the 'include'
 attribute on the root PropertyNode element.  For example,

  --aircraft=c172

is now an alias for

  --aircraft=c172r

which is an alias for

  --aircraft=c172r-jsbsim

All JSBSim *-set.xml files have been renamed to include 'jsbsim'
explicitly in their names; the ones without 'jsbsim' are now aliases
to the default, whatever that may be.

Here are some new, simpler aircraft identifiers:

  --aircraft=cub
  --aircraft=747
  --aircraft=sopwithCamel
  --aircraft=c310-3d

and so on.

This system allows users to create new *-set.xml files by overriding
parts of existing ones rather than by cut-and-paste.
---
 Aircraft/747-set.xml                |   7 ++
 Aircraft/X15-jsbsim-set.xml         |  81 ++++++++++++++++
 Aircraft/X15-set.xml                |  78 +---------------
 Aircraft/a4-3d-set.xml              |   7 ++
 Aircraft/a4-set.xml                 |   7 ++
 Aircraft/airwaveXtreme150-set.xml   |   7 ++
 Aircraft/asw20-set.xml              |   7 ++
 Aircraft/c172-3d-set.xml            |  94 +------------------
 Aircraft/c172-ifr-set.xml           |  71 +-------------
 Aircraft/c172-set.xml               |  85 +----------------
 Aircraft/c172p-3d-jsbsim-set.xml    | 105 +++++++++++++++++++++
 Aircraft/c172p-3d-set.xml           | 102 +-------------------
 Aircraft/c172p-jsbsim-set.xml       |  91 ++++++++++++++++++
 Aircraft/c172p-set.xml              |  88 +----------------
 Aircraft/c172r-3d-jsbsim-set.xml    |  97 +++++++++++++++++++
 Aircraft/c172r-3d-set.xml           |   7 ++
 Aircraft/c172r-3d-yasim-set.xml     |  98 +++++++++++++++++++
 Aircraft/c172r-jsbsim-set.xml       |  88 +++++++++++++++++
 Aircraft/c172r-set.xml              |   7 ++
 Aircraft/c172r-yasim-set.xml        |  67 +++++++++++++
 Aircraft/c182-jsbsim-set.xml        | 109 ++++++++++++++++++++++
 Aircraft/c182-set.xml               | 106 +--------------------
 Aircraft/c310-3d-set.xml            |   7 ++
 Aircraft/c310-set.xml               | 126 +------------------------
 Aircraft/c310u3a-3d-jsbsim-set.xml  | 140 ++++++++++++++++++++++++++++
 Aircraft/c310u3a-jsbsim-set.xml     | 129 +++++++++++++++++++++++++
 Aircraft/c310u3a-yasim-set.xml      |  53 +++++++++++
 Aircraft/cub-set.xml                |   7 ++
 Aircraft/dc3-set.xml                |   7 ++
 Aircraft/f16-jsbsim-set.xml         |  43 +++++++++
 Aircraft/f16-set.xml                |  40 +-------
 Aircraft/harrier-set.xml            |   7 ++
 Aircraft/j3cub-3d-set.xml           |   7 ++
 Aircraft/j3cub-3d-yasim-set.xml     |  81 ++++++++++++++++
 Aircraft/j3cub-set.xml              |   7 ++
 Aircraft/marchetti-set.xml          |   7 ++
 Aircraft/shuttle-jsbsim-set.xml     |  48 ++++++++++
 Aircraft/shuttle-set.xml            |  45 +--------
 Aircraft/sopwithCamel-set.xml       |   7 ++
 Aircraft/wrightFlyer1903-3d-set.xml |   7 ++
 Aircraft/wrightFlyer1903-set.xml    |   7 ++
 Aircraft/x24-set.xml                |   7 ++
 Aircraft/x24b-jsbsim-set.xml        |  57 +++++++++++
 Aircraft/x24b-set.xml               |  54 +----------
 44 files changed, 1434 insertions(+), 868 deletions(-)
 create mode 100644 Aircraft/747-set.xml
 create mode 100644 Aircraft/X15-jsbsim-set.xml
 create mode 100644 Aircraft/a4-3d-set.xml
 create mode 100644 Aircraft/a4-set.xml
 create mode 100644 Aircraft/airwaveXtreme150-set.xml
 create mode 100644 Aircraft/asw20-set.xml
 create mode 100644 Aircraft/c172p-3d-jsbsim-set.xml
 create mode 100644 Aircraft/c172p-jsbsim-set.xml
 create mode 100644 Aircraft/c172r-3d-jsbsim-set.xml
 create mode 100644 Aircraft/c172r-3d-set.xml
 create mode 100644 Aircraft/c172r-3d-yasim-set.xml
 create mode 100644 Aircraft/c172r-jsbsim-set.xml
 create mode 100644 Aircraft/c172r-set.xml
 create mode 100644 Aircraft/c172r-yasim-set.xml
 create mode 100644 Aircraft/c182-jsbsim-set.xml
 create mode 100644 Aircraft/c310-3d-set.xml
 create mode 100644 Aircraft/c310u3a-3d-jsbsim-set.xml
 create mode 100644 Aircraft/c310u3a-jsbsim-set.xml
 create mode 100644 Aircraft/c310u3a-yasim-set.xml
 create mode 100644 Aircraft/cub-set.xml
 create mode 100644 Aircraft/dc3-set.xml
 create mode 100644 Aircraft/f16-jsbsim-set.xml
 create mode 100644 Aircraft/harrier-set.xml
 create mode 100644 Aircraft/j3cub-3d-set.xml
 create mode 100644 Aircraft/j3cub-3d-yasim-set.xml
 create mode 100644 Aircraft/j3cub-set.xml
 create mode 100644 Aircraft/marchetti-set.xml
 create mode 100644 Aircraft/shuttle-jsbsim-set.xml
 create mode 100644 Aircraft/sopwithCamel-set.xml
 create mode 100644 Aircraft/wrightFlyer1903-3d-set.xml
 create mode 100644 Aircraft/wrightFlyer1903-set.xml
 create mode 100644 Aircraft/x24-set.xml
 create mode 100644 Aircraft/x24b-jsbsim-set.xml

diff --git a/Aircraft/747-set.xml b/Aircraft/747-set.xml
new file mode 100644
index 000000000..517c1c084
--- /dev/null
+++ b/Aircraft/747-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="747-yasim-set.xml">
+ <sim>
+  <description>Alias for 747-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/X15-jsbsim-set.xml b/Aircraft/X15-jsbsim-set.xml
new file mode 100644
index 000000000..db126da73
--- /dev/null
+++ b/Aircraft/X15-jsbsim-set.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+X15 simulation config. This files ties together all the components
+used by FGFS to represent the X15. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>North American X-15</description>
+ 
+  <startup>
+   <speed-set>knots</speed-set>
+   <onground>false</onground>
+  </startup>
+
+  <flight-model>jsb</flight-model>
+  <aero>X15</aero>
+
+  <systems>
+   <electrical>
+    <path>Aircraft/Generic/generic-electrical.xml</path>
+   </electrical>
+  </systems> 
+
+  <sound>
+   <audible>false</audible>
+  </sound>
+
+  <panel>
+   <path>Aircraft/X15/Panels/X15-panel.xml</path>
+   <visibility>true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+  
+<!-- gear up -->
+  <model>
+   <path>Aircraft/X15/Models/X15_flight.ac</path>
+  </model> 
+<!-- gear down 
+  <model>
+   <path>Aircraft/X15/Models/X15_landing.ac</path>
+  </model_2> 
+-->
+
+ </sim>
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">300.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">400.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">4000.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">3000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">25000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.001</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.0</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <position>
+  <altitude-ft>35000</altitude-ft>
+ </position>
+
+ <velocities>
+  <airspeed-kt>250</airspeed-kt>
+ </velocities>
+
+</PropertyList>
+
+
+
diff --git a/Aircraft/X15-set.xml b/Aircraft/X15-set.xml
index db126da73..07c56e942 100644
--- a/Aircraft/X15-set.xml
+++ b/Aircraft/X15-set.xml
@@ -1,81 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-X15 simulation config. This files ties together all the components
-used by FGFS to represent the X15. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="X15-jsbsim-set.xml">
  <sim>
-
-  <description>North American X-15</description>
- 
-  <startup>
-   <speed-set>knots</speed-set>
-   <onground>false</onground>
-  </startup>
-
-  <flight-model>jsb</flight-model>
-  <aero>X15</aero>
-
-  <systems>
-   <electrical>
-    <path>Aircraft/Generic/generic-electrical.xml</path>
-   </electrical>
-  </systems> 
-
-  <sound>
-   <audible>false</audible>
-  </sound>
-
-  <panel>
-   <path>Aircraft/X15/Panels/X15-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-  
-<!-- gear up -->
-  <model>
-   <path>Aircraft/X15/Models/X15_flight.ac</path>
-  </model> 
-<!-- gear down 
-  <model>
-   <path>Aircraft/X15/Models/X15_landing.ac</path>
-  </model_2> 
--->
-
+  <description>Alias for X15-jsbsim.</description>
  </sim>
-
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">300.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">400.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">4000.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">3000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">25000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.001</integral-contribution>
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.0</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <position>
-  <altitude-ft>35000</altitude-ft>
- </position>
-
- <velocities>
-  <airspeed-kt>250</airspeed-kt>
- </velocities>
-
 </PropertyList>
-
-
-
diff --git a/Aircraft/a4-3d-set.xml b/Aircraft/a4-3d-set.xml
new file mode 100644
index 000000000..e588a2b32
--- /dev/null
+++ b/Aircraft/a4-3d-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="a4-yasim-set.xml">
+ <sim>
+  <description>Alias for a4-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/a4-set.xml b/Aircraft/a4-set.xml
new file mode 100644
index 000000000..e588a2b32
--- /dev/null
+++ b/Aircraft/a4-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="a4-yasim-set.xml">
+ <sim>
+  <description>Alias for a4-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/airwaveXtreme150-set.xml b/Aircraft/airwaveXtreme150-set.xml
new file mode 100644
index 000000000..4684924d8
--- /dev/null
+++ b/Aircraft/airwaveXtreme150-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="airwaveXtreme150-v1-nl-uiuc-set.xml">
+ <sim>
+  <description>Alias for airwaveXtreme150-v1-nl-uiuc.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/asw20-set.xml b/Aircraft/asw20-set.xml
new file mode 100644
index 000000000..7f8d27a34
--- /dev/null
+++ b/Aircraft/asw20-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="asw20-v1-nl-uiuc-set.xml">
+ <sim>
+  <description>Alias for asw20-v1-nl-uiuc.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/c172-3d-set.xml b/Aircraft/c172-3d-set.xml
index e7a2436ee..a4cf0fc88 100644
--- a/Aircraft/c172-3d-set.xml
+++ b/Aircraft/c172-3d-set.xml
@@ -1,97 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="c172r-3d-set.xml">
  <sim>
-
-  <description>Cessna 172 w. 3D cockpit</description>
-
-  <allow-toggle-cockpit archive="y">true</allow-toggle-cockpit>
-
-  <flight-model archive="y">jsb</flight-model>
-  <aero archive="y">c172r</aero>
-  
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible archive="y">true</audible>
-   <path archive="y">Aircraft/c172/c172-sound.xml</path>
-  </sound>
-
-  <panel>
-   <visibility archive="y">false</visibility>
-  </panel>
-
-  <model>
-   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
-  </model>
-
-  <view>
-   <internal archive="y">true</internal>
-   <config>
-     <x-offset-m archive="y">-0.25</x-offset-m>
-     <y-offset-m archive="y">0.20</y-offset-m>
-     <z-offset-m archive="y">0.66</z-offset-m>
-   </config>
-  </view>
-
-  <current-view>
-   <pitch-offset-deg>-13</pitch-offset-deg>
-  </current-view>
-
+  <description>Alias for c172r-3d.</description>
  </sim>
-  
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution> 
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us archive="y">20</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us archive="y">20</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-
- <controls>
-  <aileron-trim>-.117</aileron-trim>
-  <elevator-trim>0</elevator-trim>
-  <rudder-trim>0</rudder-trim>
-  <magnetos>3</magnetos>
- </controls>
-
- <engines>
-  <engine>
-   <rpm>700</rpm>
-  </engine>
- </engines>
-  
 </PropertyList>
-
-
diff --git a/Aircraft/c172-ifr-set.xml b/Aircraft/c172-ifr-set.xml
index d5b8546e9..8d64a6084 100644
--- a/Aircraft/c172-ifr-set.xml
+++ b/Aircraft/c172-ifr-set.xml
@@ -10,83 +10,14 @@ October 23 2001 John Check, fgpanels@rockfish.net
 ************************************************************************
 -->
 
-<PropertyList>
+<PropertyList include="c172-set.xml">
 
  <sim>
-
   <description>Cessna 172 in IFR configuration</description>
- 
-  <flight-model archive="y">jsb</flight-model>
-  <aero archive="y">c172r</aero>
-
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible archive="y">true</audible>
-   <path archive="y">Aircraft/c172/c172-sound.xml</path>
-  </sound>
-
   <panel>
    <path>Aircraft/c172/Panels/c172-ifr-panel.xml</path>
    <visibility archive="y">true</visibility>
   </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-  
-
-  <model>
-   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
-  </model>
-
-   <current-view>
-    <pitch-offset-deg>-8</pitch-offset-deg>
-   </current-view>
-
  </sim>
-  
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution> 
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
- 
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-
- <controls>
-  <!--
-  <aileron-trim>-0.117</aileron-trim>
-  <elevator-trim>0</elevator-trim>
-  <rudder-trim>0</rudder-trim>
-  -->
-  <magnetos>3</magnetos>
- </controls>
-
- <engines>
-  <engine>
-   <rpm type="double">700</rpm>
-  </engine>
- </engines>
-
 
 </PropertyList>
diff --git a/Aircraft/c172-set.xml b/Aircraft/c172-set.xml
index d4a0a1867..58c19b892 100644
--- a/Aircraft/c172-set.xml
+++ b/Aircraft/c172-set.xml
@@ -1,88 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="c172r-set.xml">
  <sim>
-
-  <description>Cessna 172</description>
- 
-  <flight-model archive="y">jsb</flight-model>
-  <aero archive="y">c172r</aero>
-
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible archive="y">true</audible>
-   <path archive="y">Aircraft/c172/c172-sound.xml</path>
-  </sound>
-
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility archive="y">true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-
-  <model>
-   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
-  </model>
-
-  <current-view>
-   <pitch-offset-deg>-8</pitch-offset-deg>
-  </current-view>
-
+  <description>Alias for c172r.</description>
  </sim>
-  
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution> 
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-
- <controls>
-  <aileron-trim>-0.117</aileron-trim>
-  <elevator-trim>0</elevator-trim>
-  <rudder-trim>0</rudder-trim>
-  <magnetos>3</magnetos>
- </controls>
-
- <engines>
-  <engine>
-   <rpm type="double">700</rpm>
-  </engine>
- </engines>
-  
 </PropertyList>
diff --git a/Aircraft/c172p-3d-jsbsim-set.xml b/Aircraft/c172p-3d-jsbsim-set.xml
new file mode 100644
index 000000000..6ff2a9068
--- /dev/null
+++ b/Aircraft/c172p-3d-jsbsim-set.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 172P</description>
+ 
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172p</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <visibility archive="y">false</visibility>
+  </panel>
+
+  <model>
+   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
+  </model>
+
+  <view>
+   <internal archive="y">true</internal>
+   <config>
+     <goal-heading-deg>3</goal-heading-deg>
+     <x-offset-m archive="y">-0.18</x-offset-m>
+     <y-offset-m archive="y">0.30</y-offset-m>
+     <z-offset-m archive="y">0.2</z-offset-m>
+     <default-field-of-view-deg>50.0</default-field-of-view-deg>
+     <default-pitch-deg>-9.5</default-pitch-deg>
+     <front-direction-deg>-1.5</front-direction-deg>
+     <front-left-direction-deg>45</front-left-direction-deg>
+     <left-direction-deg>90</left-direction-deg>
+     <back-left-direction-deg>135</back-left-direction-deg>
+     <back-direction-deg>180</back-direction-deg>
+     <back-right-direction-deg>225</back-right-direction-deg>
+     <right-direction-deg>270</right-direction-deg>
+     <front-right-direction-deg>315</front-right-direction-deg>
+   </config>
+  </view>
+
+  <current-view>
+   <field-of-view>50</field-of-view>
+   <heading-offset-deg>-1.5</heading-offset-deg>
+   <pitch-offset-deg>-9.5</pitch-offset-deg>
+  </current-view>
+
+ </sim>
+  
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.01</integral-contribution> 
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+
+ <controls>
+  <aileron-trim>-0.125</aileron-trim>
+  <rudder-trim>0.0</rudder-trim>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <engines>
+  <engine>
+   <rpm type="double">700</rpm>
+  </engine>
+ </engines>
+  
+</PropertyList>
diff --git a/Aircraft/c172p-3d-set.xml b/Aircraft/c172p-3d-set.xml
index 6ff2a9068..fc820a0b7 100644
--- a/Aircraft/c172p-3d-set.xml
+++ b/Aircraft/c172p-3d-set.xml
@@ -1,105 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="c172p-3d-jsbsim-set.xml">
  <sim>
-
-  <description>Cessna 172P</description>
- 
-  <flight-model archive="y">jsb</flight-model>
-  <aero archive="y">c172p</aero>
-  
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible archive="y">true</audible>
-   <path archive="y">Aircraft/c172/c172-sound.xml</path>
-  </sound>
-
-  <panel>
-   <visibility archive="y">false</visibility>
-  </panel>
-
-  <model>
-   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
-  </model>
-
-  <view>
-   <internal archive="y">true</internal>
-   <config>
-     <goal-heading-deg>3</goal-heading-deg>
-     <x-offset-m archive="y">-0.18</x-offset-m>
-     <y-offset-m archive="y">0.30</y-offset-m>
-     <z-offset-m archive="y">0.2</z-offset-m>
-     <default-field-of-view-deg>50.0</default-field-of-view-deg>
-     <default-pitch-deg>-9.5</default-pitch-deg>
-     <front-direction-deg>-1.5</front-direction-deg>
-     <front-left-direction-deg>45</front-left-direction-deg>
-     <left-direction-deg>90</left-direction-deg>
-     <back-left-direction-deg>135</back-left-direction-deg>
-     <back-direction-deg>180</back-direction-deg>
-     <back-right-direction-deg>225</back-right-direction-deg>
-     <right-direction-deg>270</right-direction-deg>
-     <front-right-direction-deg>315</front-right-direction-deg>
-   </config>
-  </view>
-
-  <current-view>
-   <field-of-view>50</field-of-view>
-   <heading-offset-deg>-1.5</heading-offset-deg>
-   <pitch-offset-deg>-9.5</pitch-offset-deg>
-  </current-view>
-
+  <description>Alias for c172p-3d-jsbsim.</description>
  </sim>
-  
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution> 
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-
- <controls>
-  <aileron-trim>-0.125</aileron-trim>
-  <rudder-trim>0.0</rudder-trim>
-  <magnetos>3</magnetos>
- </controls>
-
- <engines>
-  <engine>
-   <rpm type="double">700</rpm>
-  </engine>
- </engines>
-  
 </PropertyList>
diff --git a/Aircraft/c172p-jsbsim-set.xml b/Aircraft/c172p-jsbsim-set.xml
new file mode 100644
index 000000000..e4d797ee3
--- /dev/null
+++ b/Aircraft/c172p-jsbsim-set.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 172P</description>
+ 
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172p</aero>
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+   <visibility archive="y">true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+
+  <model>
+   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
+  </model>
+
+  <view>
+   <internal archive="y">false</internal>
+  </view>
+
+  <current-view>
+   <pitch-offset-deg>-8</pitch-offset-deg>
+  </current-view>
+
+ </sim>
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.01</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+
+ <controls>
+  <aileron-trim>-0.125</aileron-trim>
+  <rudder-trim>0.0</rudder-trim>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <engines>
+  <engine>
+   <rpm type="double">700</rpm>
+  </engine>
+ </engines>
+
+</PropertyList>
diff --git a/Aircraft/c172p-set.xml b/Aircraft/c172p-set.xml
index e4d797ee3..95cf781a0 100644
--- a/Aircraft/c172p-set.xml
+++ b/Aircraft/c172p-set.xml
@@ -1,91 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="c172p-jsbsim-set.xml">
  <sim>
-
-  <description>Cessna 172P</description>
- 
-  <flight-model archive="y">jsb</flight-model>
-  <aero archive="y">c172p</aero>
-
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible archive="y">true</audible>
-   <path archive="y">Aircraft/c172/c172-sound.xml</path>
-  </sound>
-
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility archive="y">true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-
-  <model>
-   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
-  </model>
-
-  <view>
-   <internal archive="y">false</internal>
-  </view>
-
-  <current-view>
-   <pitch-offset-deg>-8</pitch-offset-deg>
-  </current-view>
-
+  <description>Alias for c172p-jsbsim.</description>
  </sim>
-
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution>
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-
- <controls>
-  <aileron-trim>-0.125</aileron-trim>
-  <rudder-trim>0.0</rudder-trim>
-  <magnetos>3</magnetos>
- </controls>
-
- <engines>
-  <engine>
-   <rpm type="double">700</rpm>
-  </engine>
- </engines>
-
 </PropertyList>
diff --git a/Aircraft/c172r-3d-jsbsim-set.xml b/Aircraft/c172r-3d-jsbsim-set.xml
new file mode 100644
index 000000000..e7a2436ee
--- /dev/null
+++ b/Aircraft/c172r-3d-jsbsim-set.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 172 w. 3D cockpit</description>
+
+  <allow-toggle-cockpit archive="y">true</allow-toggle-cockpit>
+
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172r</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <visibility archive="y">false</visibility>
+  </panel>
+
+  <model>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
+  </model>
+
+  <view>
+   <internal archive="y">true</internal>
+   <config>
+     <x-offset-m archive="y">-0.25</x-offset-m>
+     <y-offset-m archive="y">0.20</y-offset-m>
+     <z-offset-m archive="y">0.66</z-offset-m>
+   </config>
+  </view>
+
+  <current-view>
+   <pitch-offset-deg>-13</pitch-offset-deg>
+  </current-view>
+
+ </sim>
+  
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.01</integral-contribution> 
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us archive="y">20</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us archive="y">20</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+
+ <controls>
+  <aileron-trim>-.117</aileron-trim>
+  <elevator-trim>0</elevator-trim>
+  <rudder-trim>0</rudder-trim>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <engines>
+  <engine>
+   <rpm>700</rpm>
+  </engine>
+ </engines>
+  
+</PropertyList>
+
+
diff --git a/Aircraft/c172r-3d-set.xml b/Aircraft/c172r-3d-set.xml
new file mode 100644
index 000000000..f054523f0
--- /dev/null
+++ b/Aircraft/c172r-3d-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="c172r-3d-jsbsim-set.xml">
+ <sim>
+  <description>Alias for c172r-3d-jsbsim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/c172r-3d-yasim-set.xml b/Aircraft/c172r-3d-yasim-set.xml
new file mode 100644
index 000000000..d966502b6
--- /dev/null
+++ b/Aircraft/c172r-3d-yasim-set.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 172 w. 3D cockpit (YASim)</description>
+
+  <virtual-cockpit archive="y">true</virtual-cockpit>
+
+  <flight-model archive="y">yasim</flight-model>
+  <aero archive="y">c172</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <visibility archive="n">false</visibility>
+  </panel>
+
+  <model>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
+  </model>
+
+  <view>
+   <internal archive="y">true</internal>
+   <config>
+     <x-offset-m archive="y">-0.25</x-offset-m>
+     <y-offset-m archive="y">0.20</y-offset-m>
+     <z-offset-m archive="y">0.66</z-offset-m>
+   </config>
+  </view>
+
+  <current-view>
+   <pitch-offset-deg>-13</pitch-offset-deg>
+  </current-view>
+
+ </sim>
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.01</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us archive="y">20</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us archive="y">20</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+
+
+ <controls>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <engines>
+  <engine>
+   <rpm>700</rpm>
+  </engine>
+ </engines>
+
+
+</PropertyList>
+
+
+
+
diff --git a/Aircraft/c172r-jsbsim-set.xml b/Aircraft/c172r-jsbsim-set.xml
new file mode 100644
index 000000000..d4a0a1867
--- /dev/null
+++ b/Aircraft/c172r-jsbsim-set.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 172</description>
+ 
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172r</aero>
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+   <visibility archive="y">true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+
+  <model>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
+  </model>
+
+  <current-view>
+   <pitch-offset-deg>-8</pitch-offset-deg>
+  </current-view>
+
+ </sim>
+  
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.01</integral-contribution> 
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+
+ <controls>
+  <aileron-trim>-0.117</aileron-trim>
+  <elevator-trim>0</elevator-trim>
+  <rudder-trim>0</rudder-trim>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <engines>
+  <engine>
+   <rpm type="double">700</rpm>
+  </engine>
+ </engines>
+  
+</PropertyList>
diff --git a/Aircraft/c172r-set.xml b/Aircraft/c172r-set.xml
new file mode 100644
index 000000000..7e7533c4a
--- /dev/null
+++ b/Aircraft/c172r-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="c172r-jsbsim-set.xml">
+ <sim>
+  <description>Alias for c172r-jsbsim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/c172r-yasim-set.xml b/Aircraft/c172r-yasim-set.xml
new file mode 100644
index 000000000..75bac8ab9
--- /dev/null
+++ b/Aircraft/c172r-yasim-set.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+ <sim>
+
+  <description>Cessna 172 (YASim)</description>
+
+  <flight-model archive="y">yasim</flight-model>
+  <aero archive="y">c172</aero>
+  <fuel-fraction>1.0</fuel-fraction>
+  <fuel-fraction>1.0</fuel-fraction>
+   
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+   <visibility archive="y">true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+
+  <model>
+   <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
+  </model>
+
+ </sim>
+
+ <controls>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.008</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.001</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+</PropertyList>
+
+
diff --git a/Aircraft/c182-jsbsim-set.xml b/Aircraft/c182-jsbsim-set.xml
new file mode 100644
index 000000000..d3f2f160c
--- /dev/null
+++ b/Aircraft/c182-jsbsim-set.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 182 simulation config. This files ties together all the components
+used by FGFS to represent the C182. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+n
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 182</description>
+ 
+  <flight-model>jsb</flight-model>
+  <aero>c182</aero>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible>true</audible>
+   <path>Aircraft/c182/c182-sound.xml</path>
+  </sound>
+
+  <panel>
+   <path>Aircraft/c182/Panels/c182s-panel.xml</path>
+   <visibility>true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+  
+  <model>
+   <path>Aircraft/c172/Models/c172-dpm.xml</path>
+  </model>
+
+ </sim>
+ 
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us>40</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us>40</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+  
+ <input>
+
+  <keyboard>
+    <key n="60">
+     <name>&lt;</name>
+     <desc>Rudder Trim Left</desc>
+     <binding>
+      <command>property-adjust</command>
+      <property>/controls/rudder-trim</property>
+      <min type="double">-1.0</min>
+      <step type="double">-0.001</step>
+     </binding>
+    </key>
+    <key n="62">
+     <name>&gt;</name>
+     <desc>Rudder Trim Right</desc>
+     <binding>
+      <command>property-adjust</command>
+      <property>/controls/rudder-trim</property>
+      <max type="double">1.0</max>
+      <step type="double">0.001</step>
+     </binding>
+    </key>
+  </keyboard>
+ </input>
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">95.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">800.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.004</integral-contribution> 
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.07</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <controls>
+  <magnetos>3</magnetos>
+ </controls>
+
+ <engines>
+  <engine>
+   <rpm>900</rpm>
+  </engine>
+ </engines>
+  
+</PropertyList>
+
+
diff --git a/Aircraft/c182-set.xml b/Aircraft/c182-set.xml
index d3f2f160c..548a6e3c6 100644
--- a/Aircraft/c182-set.xml
+++ b/Aircraft/c182-set.xml
@@ -1,109 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 182 simulation config. This files ties together all the components
-used by FGFS to represent the C182. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-n
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="c182-jsbsim-set.xml">
  <sim>
-
-  <description>Cessna 182</description>
- 
-  <flight-model>jsb</flight-model>
-  <aero>c182</aero>
-  
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible>true</audible>
-   <path>Aircraft/c182/c182-sound.xml</path>
-  </sound>
-
-  <panel>
-   <path>Aircraft/c182/Panels/c182s-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-  
-  <model>
-   <path>Aircraft/c172/Models/c172-dpm.xml</path>
-  </model>
-
+  <description>Alias for c182-jsbsim.</description>
  </sim>
- 
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us>40</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us>40</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-  
- <input>
-
-  <keyboard>
-    <key n="60">
-     <name>&lt;</name>
-     <desc>Rudder Trim Left</desc>
-     <binding>
-      <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
-      <min type="double">-1.0</min>
-      <step type="double">-0.001</step>
-     </binding>
-    </key>
-    <key n="62">
-     <name>&gt;</name>
-     <desc>Rudder Trim Right</desc>
-     <binding>
-      <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
-      <max type="double">1.0</max>
-      <step type="double">0.001</step>
-     </binding>
-    </key>
-  </keyboard>
- </input>
-
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">95.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">800.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.004</integral-contribution> 
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.07</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <controls>
-  <magnetos>3</magnetos>
- </controls>
-
- <engines>
-  <engine>
-   <rpm>900</rpm>
-  </engine>
- </engines>
-  
 </PropertyList>
-
-
diff --git a/Aircraft/c310-3d-set.xml b/Aircraft/c310-3d-set.xml
new file mode 100644
index 000000000..d3f38bf7f
--- /dev/null
+++ b/Aircraft/c310-3d-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="c310u3a-3d-jsbsim-set.xml">
+ <sim>
+  <description>Alias for c310u3a-3d-jsbsim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/c310-set.xml b/Aircraft/c310-set.xml
index f0452679e..94e2e08e1 100644
--- a/Aircraft/c310-set.xml
+++ b/Aircraft/c310-set.xml
@@ -1,129 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 310R simulation config. This files ties together all the components
-used by FGFS to represent the C310R. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
-
- <engines>
-  <engine n="0">
-   <rpm>1000</rpm>
-  </engine>
-  <engine n="1">
-   <rpm>1000</rpm>
-  </engine>
- </engines>
-  
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us archive="y">14</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us archive="y">14</level-gal_us>
-   </tank>
-   <tank n="2">
-    <level-gal_us archive="y">14</level-gal_us>
-   </tank>
-   <tank n="3">
-    <level-gal_us archive="y">14</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
- 
- <controls>
-  <aileron-trim>-0.026</aileron-trim>
-  <magnetos n="0">3</magnetos>
-  <magnetos n="1">3</magnetos>
- </controls>
 
+<PropertyList include="c310u3a-jsbsim-set.xml">
  <sim>
-
-  <description>Cessna 310</description>
-  
-  <flight-model>jsb</flight-model>
-  <aero>c310</aero>
-  
-  <systems>
-    <electrical>
-      <path>Aircraft/c172/c172-electrical.xml</path>
-    </electrical>
-  </systems>
-
-  <sound>
-   <audible>true</audible>
-   <path>Aircraft/c310/c310-sound.xml</path>
-  </sound>
-
-  <panel>
-  <path>Aircraft/c310/c310-vfr-panel.xml</path>
-  <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c310/c310-mini-panel.xml</path>
-  </panel_2>
- 
-  <model>
-   <path>Aircraft/c310u3a/Models/c310u3a.xml</path>
-  </model> 
-
-  <instrument-options>
-   <dg>
-    <style>1</style>
-   </dg>
-  </instrument-options> 
-
-  <current-view>
-   <pitch-offset-deg>-5</pitch-offset-deg>
-  </current-view>
-
+  <description>Alias for c310u3a-jsbsim.</description>
  </sim>
-
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">81.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">107.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">1000.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.004</integral-contribution>
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.11</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <input>
-
-  <keyboard>
-    <key n="60">
-     <name>&lt;</name>
-     <desc>Rudder Trim Left</desc>
-     <binding>
-      <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
-      <min type="double">-1.0</min>
-      <step type="double">-0.001</step>
-     </binding>
-    </key>
-    <key n="62">
-     <name>&gt;</name>
-     <desc>Rudder Trim Right</desc>
-     <binding>
-      <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
-      <max type="double">1.0</max>
-      <step type="double">0.001</step>
-     </binding>
-    </key>
-  </keyboard>
- </input>
-
-  
 </PropertyList>
diff --git a/Aircraft/c310u3a-3d-jsbsim-set.xml b/Aircraft/c310u3a-3d-jsbsim-set.xml
new file mode 100644
index 000000000..0b08eb4b5
--- /dev/null
+++ b/Aircraft/c310u3a-3d-jsbsim-set.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 310U3A simulation config. This files ties together all the components
+used by FGFS to represent the C310R. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+March 2002 Jim Wilson, jimw@kelcomaine.com
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 310U3A w. 3D cockpit</description>
+  
+  <virtual-cockpit archive="y">true</virtual-cockpit>
+  <allow-toggle-cockpit archive="y">true</allow-toggle-cockpit>
+
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c310u3a</aero>
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+ 
+  <sound>
+   <audible>true</audible>
+   <path>Aircraft/c310/c310-sound.xml</path>
+  </sound>
+
+  <panel>
+    <path>Aircraft/c310u3a/c310u3a-panel.xml</path>
+    <visibility>false</visibility>
+  </panel>
+ 
+  <model>
+   <path>Aircraft/c310u3a/Models/c310u3a.xml</path>
+   <light-blinks-minute type="int">60</light-blinks-minute>
+  </model> 
+
+  <view n="0">
+   <internal archive="y">true</internal>
+   <config>
+    <x-offset-m archive="y">-0.28</x-offset-m>
+    <y-offset-m archive="y">0.62</y-offset-m>
+    <z-offset-m archive="y">-0.10</z-offset-m>
+   </config>
+  </view>
+
+  <current-view>
+    <pitch-offset-deg>-7</pitch-offset-deg>
+  </current-view>
+
+  <instrument-options>
+   <dg>
+    <style>1</style>
+   </dg>
+  </instrument-options> 
+
+ </sim>
+ 
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+   <tank n="2">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+   <tank n="3">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+        
+ <controls>
+  <aileron-trim>-0.026</aileron-trim>
+  <magnetos n="0">3</magnetos>
+  <magnetos n="1">3</magnetos>
+ </controls>
+
+ <engines>
+  <engine n="0">
+   <rpm type="double">1000</rpm>
+  </engine>
+  <engine n="1">
+   <rpm type="double">1000</rpm>
+  </engine>
+ </engines>
+
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">81.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">107.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">1000.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">3000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.004</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.11</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <input>
+
+  <keyboard>
+    <key n="60">
+     <name>&lt;</name>
+     <desc>Rudder Trim Left</desc>
+     <binding>
+      <command>property-adjust</command>
+      <property>/controls/rudder-trim</property>
+      <min type="double">-1.0</min>
+      <step type="double">-0.001</step>
+     </binding>
+    </key>
+    <key n="62">
+     <name>&gt;</name>
+     <desc>Rudder Trim Right</desc>
+     <binding>
+      <command>property-adjust</command>
+      <property>/controls/rudder-trim</property>
+      <max type="double">1.0</max>
+      <step type="double">0.001</step>
+     </binding>
+    </key>
+  </keyboard>
+ </input>
+
+  
+</PropertyList>
diff --git a/Aircraft/c310u3a-jsbsim-set.xml b/Aircraft/c310u3a-jsbsim-set.xml
new file mode 100644
index 000000000..0872dbbf5
--- /dev/null
+++ b/Aircraft/c310u3a-jsbsim-set.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 310U3A simulation config. This files ties together all the components
+used by FGFS to represent the C310R. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+March 2002 Jim Wilson, jimw@kelcomaine.com
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 310U3A</description>
+  
+  <flight-model>jsb</flight-model>
+  <aero>c310u3a</aero>
+
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+  
+  <sound>
+   <audible>true</audible>
+   <path>Aircraft/c310/c310-sound.xml</path>
+  </sound>
+
+  <panel>
+  <path>Aircraft/c310u3a/c310u3a-panel.xml</path>
+  <visibility>true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c310/c310-mini-panel.xml</path>
+  </panel_2>
+ 
+  <model>
+   <path>Aircraft/c310u3a/Models/c310u3a.xml</path>
+  </model> 
+
+  <instrument-options>
+   <dg>
+    <style>1</style>
+   </dg>
+  </instrument-options> 
+
+ </sim>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+   <tank n="2">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+   <tank n="3">
+    <level-gal_us archive="y">14</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+ 
+ <controls>
+  <aileron-trim>-0.026</aileron-trim>
+  <magnetos n="0">3</magnetos>
+  <magnetos n="1">3</magnetos>
+ </controls>
+
+ <engines>
+  <engine n="0">
+   <rpm>1000</rpm>
+  </engine>
+  <engine n="1">
+   <rpm>1000</rpm>
+  </engine>
+ </engines>
+  
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">81.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">107.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">1000.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.004</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.11</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <input>
+
+  <keyboard>
+    <key n="60">
+     <name>&lt;</name>
+     <desc>Rudder Trim Left</desc>
+     <binding>
+      <command>property-adjust</command>
+      <property>/controls/rudder-trim</property>
+      <min type="double">-1.0</min>
+      <step type="double">-0.001</step>
+     </binding>
+    </key>
+    <key n="62">
+     <name>&gt;</name>
+     <desc>Rudder Trim Right</desc>
+     <binding>
+      <command>property-adjust</command>
+      <property>/controls/rudder-trim</property>
+      <max type="double">1.0</max>
+      <step type="double">0.001</step>
+     </binding>
+    </key>
+  </keyboard>
+ </input>
+
+
+</PropertyList>
+
+
+
+
diff --git a/Aircraft/c310u3a-yasim-set.xml b/Aircraft/c310u3a-yasim-set.xml
new file mode 100644
index 000000000..dafed9ba5
--- /dev/null
+++ b/Aircraft/c310u3a-yasim-set.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 310R simulation config. This files ties together all the components
+used by FGFS to represent the C310R. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+ <sim>
+
+  <description>Cessna 310 (YASim)</description>
+
+  <flight-model>yasim</flight-model>
+  <aero>c310</aero>
+  <fuel-fraction>1.0</fuel-fraction>
+  
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible>true</audible>
+   <path>Aircraft/c310/c310-sound.xml</path>
+  </sound>
+
+  <panel>
+   <path>Aircraft/c310/c310-vfr-panel.xml</path>
+   <visibility>true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c310/c310-mini-panel.xml</path>
+  </panel_2>
+
+  <model>
+   <path>Aircraft/c310u3a/Models/c310u3a.xml</path>
+  </model> 
+ </sim>
+
+ <controls>
+  <magnetos n="0">3</magnetos>
+  <magnetos n="1">3</magnetos>
+ </controls>
+
+</PropertyList>
+
+
diff --git a/Aircraft/cub-set.xml b/Aircraft/cub-set.xml
new file mode 100644
index 000000000..2473d064d
--- /dev/null
+++ b/Aircraft/cub-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="j3cub-set.xml">
+ <sim>
+  <description>Alias for j3cub.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/dc3-set.xml b/Aircraft/dc3-set.xml
new file mode 100644
index 000000000..1386cc8fe
--- /dev/null
+++ b/Aircraft/dc3-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="dc3-yasim-set.xml">
+ <sim>
+  <description>Alias for dc3-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/f16-jsbsim-set.xml b/Aircraft/f16-jsbsim-set.xml
new file mode 100644
index 000000000..09b868c81
--- /dev/null
+++ b/Aircraft/f16-jsbsim-set.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Cessna 172 simulation config. This files ties together all the components
+used by FGFS to represent the C172. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>General Dynamics F-16</description>
+ 
+  <flight-model>jsb</flight-model>
+  <aero>f16</aero>
+  
+  <systems>
+   <electrical>
+    <path>Aircraft/Generic/generic-electrical.xml</path>
+   </electrical>
+  </systems> 
+  
+  <sound>
+   <audible>true</audible>
+   <path>Aircraft/a4/a4-sound.xml</path>
+  </sound>
+
+  <panel>
+   <visibility>false</visibility>
+  </panel>
+
+  <model>
+   <path>Aircraft/a4/Models/a4-blue.xml</path>
+  </model>
+
+ </sim>
+
+</PropertyList>
diff --git a/Aircraft/f16-set.xml b/Aircraft/f16-set.xml
index 09b868c81..d14e19f11 100644
--- a/Aircraft/f16-set.xml
+++ b/Aircraft/f16-set.xml
@@ -1,43 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="f16-jsbsim-set.xml">
  <sim>
-
-  <description>General Dynamics F-16</description>
- 
-  <flight-model>jsb</flight-model>
-  <aero>f16</aero>
-  
-  <systems>
-   <electrical>
-    <path>Aircraft/Generic/generic-electrical.xml</path>
-   </electrical>
-  </systems> 
-  
-  <sound>
-   <audible>true</audible>
-   <path>Aircraft/a4/a4-sound.xml</path>
-  </sound>
-
-  <panel>
-   <visibility>false</visibility>
-  </panel>
-
-  <model>
-   <path>Aircraft/a4/Models/a4-blue.xml</path>
-  </model>
-
+  <description>Alias for f16-jsbsim.</description>
  </sim>
-
 </PropertyList>
diff --git a/Aircraft/harrier-set.xml b/Aircraft/harrier-set.xml
new file mode 100644
index 000000000..860b0810e
--- /dev/null
+++ b/Aircraft/harrier-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="harrier-yasim-set.xml">
+ <sim>
+  <description>Alias for harrier-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/j3cub-3d-set.xml b/Aircraft/j3cub-3d-set.xml
new file mode 100644
index 000000000..b75c4e022
--- /dev/null
+++ b/Aircraft/j3cub-3d-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="j3cub-3d-yasim-set.xml">
+ <sim>
+  <description>Alias for j3cub-3d-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/j3cub-3d-yasim-set.xml b/Aircraft/j3cub-3d-yasim-set.xml
new file mode 100644
index 000000000..0ea2913bc
--- /dev/null
+++ b/Aircraft/j3cub-3d-yasim-set.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Piper J3 Cub simulation config. This files ties together all the components
+used by FGFS to represent the J3 Cub. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+************************************************************************
+-->
+
+<PropertyList>
+ <sim>
+
+  <description>Piper Cub J3 Trainer (YASim)</description>
+
+  <flight-model>yasim</flight-model>
+  <aero>j3cub</aero>
+  <fuel-fraction>0.8</fuel-fraction>
+  
+  <systems>
+   <electrical>
+    <path>Aircraft/Generic/generic-electrical.xml</path>
+   </electrical>
+  </systems> 
+
+  <sound>
+   <audible>true</audible>
+   <path>Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
+  <panel>
+   <visibility archive="n">false</visibility>
+  </panel>
+
+  <model>
+   <path archive="y">Aircraft/j3cub/Models/j3cub.xml</path>
+  </model>
+
+  <current-view>
+   <pitch-offset-deg>-8</pitch-offset-deg>
+  </current-view>
+
+  <view>
+   <internal archive="y">true</internal>
+   <config>
+     <x-offset-m archive="y">0.0</x-offset-m>
+     <y-offset-m archive="y">-0.3</y-offset-m>
+     <z-offset-m archive="y">0.4</z-offset-m>
+   </config>
+  </view>
+
+ </sim>
+
+ <yasim>
+  <j3cub>
+   <pilot-lb>180</pilot-lb>
+  </j3cub>
+ </yasim>
+
+ <controls>
+  <aileron-trim>0.0076</aileron-trim>   <!-- fixed -->
+  <elevator-trim>0.0000</elevator-trim> <!-- controllable -->
+  <rudder-trim>0.0020</rudder-trim>     <!-- fixed -->
+  <magnetos>3</magnetos>
+ </controls>
+
+ <!-- An autopilot on a Cub??? -->  
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">48.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">56.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">400.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">6000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.008</integral-contribution> 
+     <zero-pitch-throttle type="float">0.35</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.001</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+</PropertyList>
diff --git a/Aircraft/j3cub-set.xml b/Aircraft/j3cub-set.xml
new file mode 100644
index 000000000..b75c4e022
--- /dev/null
+++ b/Aircraft/j3cub-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="j3cub-3d-yasim-set.xml">
+ <sim>
+  <description>Alias for j3cub-3d-yasim.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/marchetti-set.xml b/Aircraft/marchetti-set.xml
new file mode 100644
index 000000000..98773ad6e
--- /dev/null
+++ b/Aircraft/marchetti-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="marchetti-v1-uiuc-set.xml">
+ <sim>
+  <description>Alias for marchetti-v1-uiuc.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/shuttle-jsbsim-set.xml b/Aircraft/shuttle-jsbsim-set.xml
new file mode 100644
index 000000000..dbcb42ce6
--- /dev/null
+++ b/Aircraft/shuttle-jsbsim-set.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Space Shuttle simulation config. This files ties together all the components
+used by FGFS to represent the shuttle. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Space Shuttle</description>
+  
+  <flight-model>jsb</flight-model>
+  <aero>shuttle</aero>
+  
+  <systems>
+   <electrical>
+    <path>Aircraft/Generic/generic-electrical.xml</path>
+   </electrical>
+  </systems> 
+
+  <sound>
+   <audible>true</audible>
+  </sound>
+
+  <panel>
+   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+   <visibility>true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+
+  <model>
+   <path><!-- you need to set this --></path>
+  </model>
+
+ </sim>
+ 
+</PropertyList>
+
+
diff --git a/Aircraft/shuttle-set.xml b/Aircraft/shuttle-set.xml
index dbcb42ce6..67ac140c3 100644
--- a/Aircraft/shuttle-set.xml
+++ b/Aircraft/shuttle-set.xml
@@ -1,48 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-Space Shuttle simulation config. This files ties together all the components
-used by FGFS to represent the shuttle. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="shuttle-jsbsim-set.xml">
  <sim>
-
-  <description>Space Shuttle</description>
-  
-  <flight-model>jsb</flight-model>
-  <aero>shuttle</aero>
-  
-  <systems>
-   <electrical>
-    <path>Aircraft/Generic/generic-electrical.xml</path>
-   </electrical>
-  </systems> 
-
-  <sound>
-   <audible>true</audible>
-  </sound>
-
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
-
+  <description>Alias for shuttle-jsbsim.</description>
  </sim>
- 
 </PropertyList>
-
-
diff --git a/Aircraft/sopwithCamel-set.xml b/Aircraft/sopwithCamel-set.xml
new file mode 100644
index 000000000..b034f82b1
--- /dev/null
+++ b/Aircraft/sopwithCamel-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="sopwithCamel-v1-nl-uiuc-set.xml">
+ <sim>
+  <description>Alias for sopwithCamel-v1-nl-uiuc</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/wrightFlyer1903-3d-set.xml b/Aircraft/wrightFlyer1903-3d-set.xml
new file mode 100644
index 000000000..c2b17a277
--- /dev/null
+++ b/Aircraft/wrightFlyer1903-3d-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="wrightFlyer1903-v1-nl-uiuc-set.xml">
+ <sim>
+  <description>Alias for wrightFlyer1903-v1-nl-uiuc</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/wrightFlyer1903-set.xml b/Aircraft/wrightFlyer1903-set.xml
new file mode 100644
index 000000000..c2b17a277
--- /dev/null
+++ b/Aircraft/wrightFlyer1903-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="wrightFlyer1903-v1-nl-uiuc-set.xml">
+ <sim>
+  <description>Alias for wrightFlyer1903-v1-nl-uiuc</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/x24-set.xml b/Aircraft/x24-set.xml
new file mode 100644
index 000000000..9843b6ab5
--- /dev/null
+++ b/Aircraft/x24-set.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<PropertyList include="x24b-set.xml">
+ <sim>
+  <description>Alias for x24b.</description>
+ </sim>
+</PropertyList>
diff --git a/Aircraft/x24b-jsbsim-set.xml b/Aircraft/x24b-jsbsim-set.xml
new file mode 100644
index 000000000..6ff218227
--- /dev/null
+++ b/Aircraft/x24b-jsbsim-set.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+X24B simulation config. This files ties together all the components
+used by FGFS to represent the X24B. Components include the flight data 
+model, instrument panel, and external 3D model.
+3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+
+October 23 2001 John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>USAF/NACA X-24B reentry testbed</description>
+ 
+  <startup>
+   <speed-set>knots</speed-set>
+   <onground>false</onground>
+  </startup>
+  
+  <systems>
+   <electrical>
+    <path>Aircraft/Generic/generic-electrical.xml</path>
+   </electrical>
+  </systems> 
+
+  <flight-model>jsb</flight-model>
+  <aero>x24b</aero>
+
+  <sound>
+   <audible>false</audible>
+  </sound>
+
+  <panel>
+   <path>Aircraft/X15/Panels/X15-panel.xml</path>
+   <visibility>true</visibility>
+  </panel>
+  <panel_2>
+   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+  </panel_2>
+
+ </sim>
+
+ <position>
+  <altitude-ft>35000</altitude-ft>
+ </position>
+
+ <velocities>
+  <airspeed-kt>250</airspeed-kt>
+ </velocities>
+
+</PropertyList>
+
+
diff --git a/Aircraft/x24b-set.xml b/Aircraft/x24b-set.xml
index 6ff218227..d05589f7f 100644
--- a/Aircraft/x24b-set.xml
+++ b/Aircraft/x24b-set.xml
@@ -1,57 +1,7 @@
 <?xml version="1.0"?>
-<!--
-************************************************************************
-X24B simulation config. This files ties together all the components
-used by FGFS to represent the X24B. Components include the flight data 
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
-
-October 23 2001 John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList>
 
+<PropertyList include="x24b-jsbsim-set.xml">
  <sim>
-
-  <description>USAF/NACA X-24B reentry testbed</description>
- 
-  <startup>
-   <speed-set>knots</speed-set>
-   <onground>false</onground>
-  </startup>
-  
-  <systems>
-   <electrical>
-    <path>Aircraft/Generic/generic-electrical.xml</path>
-   </electrical>
-  </systems> 
-
-  <flight-model>jsb</flight-model>
-  <aero>x24b</aero>
-
-  <sound>
-   <audible>false</audible>
-  </sound>
-
-  <panel>
-   <path>Aircraft/X15/Panels/X15-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-
+  <description>Alias for x24b-jsbsim.</description>
  </sim>
-
- <position>
-  <altitude-ft>35000</altitude-ft>
- </position>
-
- <velocities>
-  <airspeed-kt>250</airspeed-kt>
- </velocities>
-
 </PropertyList>
-
-