diff --git a/Aircraft/c172-3d-yasim-set.xml b/Aircraft/c172-3d-yasim-set.xml
index 8d97439b5..e77ad4f67 100644
--- a/Aircraft/c172-3d-yasim-set.xml
+++ b/Aircraft/c172-3d-yasim-set.xml
@@ -10,83 +10,11 @@ October 23 2001 John Check, fgpanels@rockfish.net
 ************************************************************************
 -->
 
-<PropertyList>
+<PropertyList include="c172r-3d-yasim-set.xml">
 
  <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>
-    <pitch-offset-deg>-13</pitch-offset-deg>
-   </config>
-  </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>
-
+  <description>Alias for c172r-3d-yasim</description>
+ </sim>
 
 </PropertyList>
 
diff --git a/Aircraft/c172-base.xml b/Aircraft/c172-base.xml
index c69c0e515..b9833aba4 100644
--- a/Aircraft/c172-base.xml
+++ b/Aircraft/c172-base.xml
@@ -30,6 +30,14 @@ Common configuration for all C172 aircraft.
   </attitude-indicator>
  </instrumentation>
   
+ <controls>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
+ </controls>
+
  <engines>
   <engine>
    <rpm type="double">700</rpm>
diff --git a/Aircraft/c172-yasim-set.xml b/Aircraft/c172-yasim-set.xml
index 75bac8ab9..97b0715e8 100644
--- a/Aircraft/c172-yasim-set.xml
+++ b/Aircraft/c172-yasim-set.xml
@@ -10,58 +10,12 @@ October 23 2001 John Check, fgpanels@rockfish.net
 ************************************************************************
 -->
 
-<PropertyList>
+<PropertyList include="c172r-yasim-set.xml">
+
  <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>
-
+  <description>Alias for c172r-yasim</description>
  </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/c172p-jsbsim-base.xml b/Aircraft/c172p-jsbsim-base.xml
index 05328cfe4..306bd02fc 100644
--- a/Aircraft/c172p-jsbsim-base.xml
+++ b/Aircraft/c172p-jsbsim-base.xml
@@ -17,7 +17,6 @@ Common configuration for JSBSim C172P aircraft.
  <controls>
   <aileron-trim>-0.012</aileron-trim>
   <rudder-trim>-0.025</rudder-trim>
-  <magnetos>3</magnetos>
  </controls>
 
 </PropertyList>
diff --git a/Aircraft/c172r-jsbsim-base.xml b/Aircraft/c172r-jsbsim-base.xml
index e49d6f566..b4d1a3da8 100644
--- a/Aircraft/c172r-jsbsim-base.xml
+++ b/Aircraft/c172r-jsbsim-base.xml
@@ -18,7 +18,6 @@ Common configuration for JSBSim C172R aircraft.
   <aileron-trim>-0.012</aileron-trim>
   <elevator-trim>0</elevator-trim>
   <rudder-trim>-0.025</rudder-trim>
-  <magnetos>3</magnetos>
  </controls>
 
 </PropertyList>
diff --git a/Aircraft/c172r-yasim-base.xml b/Aircraft/c172r-yasim-base.xml
index c33101bd9..bf68093de 100644
--- a/Aircraft/c172r-yasim-base.xml
+++ b/Aircraft/c172r-yasim-base.xml
@@ -14,10 +14,6 @@ Common configuration for YASim C172r aircraft.
   <fuel-fraction>1.0</fuel-fraction>
  </sim>
 
- <controls>
-  <magnetos>3</magnetos>
- </controls>
-
  <!-- TODO: trim for level cruise -->
 
 </PropertyList>
diff --git a/Aircraft/c182-jsbsim-set.xml b/Aircraft/c182-jsbsim-set.xml
index a1b61e2e9..a9c1f75a4 100644
--- a/Aircraft/c182-jsbsim-set.xml
+++ b/Aircraft/c182-jsbsim-set.xml
@@ -95,9 +95,21 @@ October 23 2001 John Check, fgpanels@rockfish.net
  </autopilot>
 
  <controls>
-  <magnetos>3</magnetos>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
  </controls>
 
+ <instrumentation>
+  <attitude-indicator>
+   <config>
+    <tumble-flag>true</tumble-flag>
+   </config>
+  </attitude-indicator>
+ </instrumentation>
+
  <engines>
   <engine>
    <rpm>900</rpm>
diff --git a/Aircraft/dc3-yasim-set.xml b/Aircraft/dc3-yasim-set.xml
index a3d587764..015e96b9d 100644
--- a/Aircraft/dc3-yasim-set.xml
+++ b/Aircraft/dc3-yasim-set.xml
@@ -56,8 +56,14 @@ October 23 2001 John Check, fgpanels@rockfish.net
  </sim>
 
  <controls>
-  <magnetos n="0">3</magnetos>
-  <magnetos n="1">3</magnetos>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+   <engine n="1">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
  </controls>
 
  <autopilot>
diff --git a/Aircraft/j3cub-3d-yasim-set.xml b/Aircraft/j3cub-3d-yasim-set.xml
index 743d2f27e..8ff41a187 100644
--- a/Aircraft/j3cub-3d-yasim-set.xml
+++ b/Aircraft/j3cub-3d-yasim-set.xml
@@ -58,7 +58,11 @@ model, instrument panel, and external 3D model.
   <aileron-trim>0.0076</aileron-trim>   <!-- fixed -->
   <elevator-trim>0.0000</elevator-trim> <!-- controllable -->
   <rudder-trim>0.0020</rudder-trim>     <!-- fixed -->
-  <magnetos>2</magnetos>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
   <door>1.0</door>
  </controls>
 
diff --git a/Aircraft/pa28-161-yasim-base.xml b/Aircraft/pa28-161-yasim-base.xml
index 7a678b3dd..7c91214ec 100644
--- a/Aircraft/pa28-161-yasim-base.xml
+++ b/Aircraft/pa28-161-yasim-base.xml
@@ -18,7 +18,6 @@ Common configuration for YASim PA28-161 aircraft.
   <aileron-trim>-0.012</aileron-trim>
   <elevator-trim>0</elevator-trim>
   <rudder-trim>0</rudder-trim>
-  <magnetos>3</magnetos>
  </controls>
 
  <yasim>
diff --git a/Aircraft/pa28-base.xml b/Aircraft/pa28-base.xml
index 978448613..4a69bcfd0 100644
--- a/Aircraft/pa28-base.xml
+++ b/Aircraft/pa28-base.xml
@@ -56,6 +56,14 @@ Common configuration for all PA28 (Piper Cherokee) aircraft.
   </attitude-indicator>
  </instrumentation>
 
+ <controls>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
+ </controls>
+
  <engines>
   <engine>
    <rpm type="double">700</rpm>
diff --git a/Aircraft/tsr2-yasim-set.xml b/Aircraft/tsr2-yasim-set.xml
index 9d3ab8baa..97e613732 100755
--- a/Aircraft/tsr2-yasim-set.xml
+++ b/Aircraft/tsr2-yasim-set.xml
@@ -44,8 +44,15 @@ BAC TSR2 simulation config.
  </sim>
 
  <controls>
-  <magnetos n="0">3</magnetos>
-  <magnetos n="1">3</magnetos>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
+   <engine n="1">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
  </controls>
 
  <autopilot>
diff --git a/Aircraft/yf23-yasim-set.xml b/Aircraft/yf23-yasim-set.xml
index f8b355fb3..6c1fefa85 100755
--- a/Aircraft/yf23-yasim-set.xml
+++ b/Aircraft/yf23-yasim-set.xml
@@ -51,8 +51,14 @@ NR/MD YF23 simulation config.
  </sim>
 
  <controls>
-  <magnetos n="0">3</magnetos>
-  <magnetos n="1">3</magnetos>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+   <engine n="1">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
  </controls>
 
  <autopilot>