diff --git a/Aircraft/Instruments/hsi2.xml b/Aircraft/Instruments/hsi2.xml
index 379c6cde2..2b066918a 100644
--- a/Aircraft/Instruments/hsi2.xml
+++ b/Aircraft/Instruments/hsi2.xml
@@ -7,230 +7,160 @@ Started 24-7-01 by Timothy Gale
 -->
 
 <PropertyList>
-    <name>HSI</name>
-    <w-base>130</w-base>
-    <h-base>134</h-base>
+ <name>HSI</name>
+ <w-base>130</w-base>
+ <h-base>134</h-base>
 
  <params>
- <nav-radial-selected>/radios/nav[0]/radials/selected-deg</nav-radial-selected>
-<nav-to-flag>/radios/nav[0]/to-flag</nav-to-flag> -->
-  <nav-from-flag>/radios/nav[0]/from-flag</nav-from-flag> -->
-<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection> 
-<hsi-has-gs-needle>/sim/instrument-options/hsi[0]/has-gs-needle</hsi-has-gs-needle>
+  <nav-radial-selected>/radios/nav[0]/radials/selected-deg</nav-radial-selected>
+  <nav-to-flag>/radios/nav[0]/to-flag</nav-to-flag>
+  <nav-from-flag>/radios/nav[0]/from-flag</nav-from-flag>
+  <nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
+  <hsi-has-gs-needle>/sim/instrument-options/hsi[0]/has-gs-needle</hsi-has-gs-needle>
+  <heading-deg>/orientation/heading-magnetic-deg</heading-deg>
+  <autopilot-heading-deg>/autopilot/settings/heading-bug-deg</autopilot-heading-deg>
  </params>
 
 <layers>
-<layer>
+ <layer>
   <name>bezel</name>
-<!--  <condition>
+<!--
+  <condition>
    <not-equals>
     <property>/sim/aero</property>
     <value>c310u3a</value> 
    </not-equals>
-  </condition> -->
+  </condition>
+-->
   <texture>
-  <path>Aircraft/Instruments/Textures/bezel3.rgb</path>
-  <x1>0.0</x1>
-  <y1>0.0</y1>
-  <x2>1.0</x2>
-  <y2>1.0</y2>
+   <path>Aircraft/Instruments/Textures/bezel3.rgb</path>
+   <x1>0.0</x1>
+   <y1>0.0</y1>
+   <x2>1.0</x2>
+   <y2>1.0</y2>
   </texture>
-   <w>122</w>
-   <h>122</h>
- <transformations>
+  <w>122</w>
+  <h>122</h>
+  <transformations>
    <transformation>
    <type>x-shift</type>
    <offset>-1.0</offset>
    </transformation>
   </transformations>
-</layer> 
+ </layer> 
 
-<!-- <layer>
-      <name>compass rose</name>
-       <texture>
-	<path>Aircraft/Instruments/Textures/faces-1.rgb</path>
-	<x1>0.0</x1>
-	<y1>0.51</y1>
-	<x2>0.49</x2>
-	<y2>1.0</y2> 
-      </texture>
-     <w>94</w>
-      <h>94</h>
-     <transformations>
-      <transformation>
-      <type>rotation</type>
-      <property>/orientation/heading-magnetic-deg</property>
-      <min>-360.0</min>
-      <max>360.0</max>
-      <scale>-1.0</scale>
-      </transformation> 
-  </transformations>
-</layer> --> 
-	
+<!--
  <layer>
-      <name>compass rose</name>
-       <texture>
-	<path>Aircraft/Instruments/Textures/faces-1-hi.rgb</path>
-	<x1>0.0</x1>
-	<y1>0.5</y1>
-	<x2>0.5</x2>
-	<y2>1.0</y2>
-      </texture>
-     <w>94</w>
-      <h>94</h>
-     <transformations>
-      <transformation>
-      <type>rotation</type>
-      <property>/orientation/heading-magnetic-deg</property>
-      <min>-360.0</min>
-      <max>360.0</max>
-      <scale>-1.0</scale>
-      </transformation>
-     </transformations>
-   </layer>  
+  <name>compass rose</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/faces-1.rgb</path>
+   <x1>0.0</x1>
+   <y1>0.51</y1>
+   <x2>0.49</x2>
+   <y2>1.0</y2> 
+  </texture>
+  <w>94</w>
+  <h>94</h>
+  <transformations>
+   <transformation>
+    <type>rotation</type>
+    <property alias="../../../../../params/heading-deg"/>
+    <scale>-1</scale>
+   </transformation> 
+  </transformations>
+ </layer>
+--> 
+    
+ <layer>
+  <name>compass rose</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/faces-1-hi.rgb</path>
+   <x1>0.0</x1>
+   <y1>0.5</y1>
+   <x2>0.5</x2>
+   <y2>1.0</y2>
+  </texture>
+  <w>94</w>
+  <h>94</h>
+  <transformations>
+   <transformation>
+    <type>rotation</type>
+    <property alias="../../../../../params/heading-deg"/>
+    <scale>-1</scale>
+   </transformation>
+  </transformations>
+ </layer>  
 
 <!-- Taken from Nav1.xml -->
-<!--  <layer>
-   <name>TO/FROM/OFF flag</name>
-   <type>switch</type>
-   <property>/radios/nav[0]/to-flag</property>
-   <layer>
-    <name>TO flag</name>
-    <texture>
-     <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-     <x1>0.9375</x1>
-     <y1>0.578125</y1>
-     <x2>1.0</x2>
-     <y2>0.625</y2>
-    </texture>
-    <w>14</w>
-    <h>14</h>
-   </layer>
-   <layer>
-    <name>FROM/OFF flag</name>
-    <type>switch</type>
-    <property>/radios/nav[0]/from-flag</property>
-    <layer>
-     <name>FROM flag</name>
-     <texture>
-      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-      <x1>0.9375</x1>
-      <y1>0.625</y1>
-      <x2>1.0</x2>
-      <y2>0.671875</y2>
-     </texture>
-     <w>14</w>
-     <h>14</h>
-    </layer>
-    <layer>
-     <name>OFF flag</name>
-     <texture>
-      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-      <x1>0.9375</x1>
-      <y1>0.5</y1>
-      <x2>1.0</x2>
-      <y2>0.546875</y2>
-     </texture>
-     <w>14</w>
-     <h>14</h>
-    </layer>
-   </layer>
-   <transformations>
-    <transformation>
-    <type>rotation</type>
-    <property>/orientation/heading-magnetic-deg</property>
-    <min>-360.0</min>
-    <max>360</max>
-    <scale>-1.0</scale>
-   </transformation>
-   <transformation>
-    <type>rotation</type>
-    <property>/radios/nav[0]/radials/selected-deg</property>
-    <min>-360.0</min>
-    <max>360.0</max>
-    <scale>1.0</scale>
-   </transformation>
-   <transformation>
-     <type>y-shift</type>
-     <offset>16</offset>
-    </transformation>
-   </transformations>
-  </layer> -->
-
+ <layer>
+  <name>TO/FROM/OFF flag</name>
+  <type>switch</type>
   <layer>
-   <name>TO/FROM/OFF flag</name>
+   <condition>
+    <property alias="../../../../../params/nav-to-flag"/>
+   </condition>
+   <name>TO flag</name>
+   <texture>
+    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+    <x1>0.9375</x1>
+    <y1>0.578125</y1>
+    <x2>1.0</x2>
+    <y2>0.625</y2>
+   </texture>
+   <w>14</w>
+   <h>14</h>
+  </layer>
+  <layer>
+   <name>FROM/OFF flag</name>
    <type>switch</type>
    <layer>
     <condition>
-     <property alias="../../../../../params/nav-to-flag"/>
+     <property alias="../../../../../../params/nav-from-flag"/>
     </condition>
-    <name>TO flag</name>
+    <name>FROM flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
      <x1>0.9375</x1>
-     <y1>0.578125</y1>
+     <y1>0.625</y1>
      <x2>1.0</x2>
-     <y2>0.625</y2>
+     <y2>0.671875</y2>
     </texture>
     <w>14</w>
     <h>14</h>
    </layer>
    <layer>
-    <name>FROM/OFF flag</name>
-    <type>switch</type>
-    <layer>
-     <condition>
-      <property alias="../../../../../../params/nav-from-flag"/>
-     </condition>
-     <name>FROM flag</name>
-     <texture>
-      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-      <x1>0.9375</x1>
-      <y1>0.625</y1>
-      <x2>1.0</x2>
-      <y2>0.671875</y2>
-     </texture>
-     <w>14</w>
-     <h>14</h>
-    </layer>
-    <layer>
-     <name>OFF flag</name>
-     <texture>
-      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-      <x1>0.9375</x1>
-      <y1>0.5</y1>
-      <x2>1.0</x2>
-      <y2>0.546875</y2>
-     </texture>
-     <w>14</w>
-     <h>14</h>
-    </layer>
+    <name>OFF flag</name>
+    <texture>
+     <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+     <x1>0.9375</x1>
+     <y1>0.5</y1>
+     <x2>1.0</x2>
+     <y2>0.546875</y2>
+    </texture>
+    <w>14</w>
+    <h>14</h>
    </layer>
-   <transformations>
- 
-    <transformation>
-<property>/orientation/heading-magnetic-deg</property>
-    <min>-360.0</min>
-    <max>360</max>
-    <scale>-1.0</scale>
-   </transformation>
+  </layer>
+  <transformations>
    <transformation>
-    <type>rotation</type>
-    <property>/radios/nav[0]/radials/selected-deg</property>
-    <min>-360.0</min>
-    <max>360.0</max>
-    <scale>1.0</scale>
+   <property alias="../../../../../params/heading-deg"/>
+   <type>rotation</type>
+   <scale>-1.0</scale>
+  </transformation>
+  <transformation>
+   <property>/radios/nav[0]/radials/selected-deg</property>
+   <type>rotation</type>   
+   <scale>1.0</scale>
+  </transformation>
+  <transformation>
+   <type>y-shift</type>
+   <offset>14</offset>
+   <type>rotation</type>
    </transformation>
- 
-<transformation>
-     <type>y-shift</type>
-     <offset>14</offset>
-     <type>rotation</type>
-    </transformation>
-</transformations>
-</layer>
+  </transformations>
+ </layer>
 
-<layer>
+ <layer>
   <name>glidescope needle</name>
   <condition>
    <equals>
@@ -246,7 +176,7 @@ Started 24-7-01 by Timothy Gale
    <y2>1.0</y2>
   </texture>
   <w>18</w>
-  <h>124</h>
+  <h>128</h>
   <transformations>
    <transformation>
     <type>y-shift</type>
@@ -260,61 +190,55 @@ Started 24-7-01 by Timothy Gale
     <offset>92</offset>
    </transformation>
   </transformations>
-  </layer> 
+ </layer> 
 
-   <layer>
-    <name>Nav1</name>
-    <texture>
-     <path>Aircraft/Instruments/Textures/hsi.rgb</path>
-     <x1>0.0</x1>
-     <y1>0.75</y1>
-     <x2>0.25</x2>
-     <y2>1.0</y2>
-    </texture>
-    <w>66</w>
-    <h>66</h>
-    <transformations>
-     <transformation>
-     <type>rotation</type>
-     <property>/orientation/heading-magnetic-deg</property>
-     <min>-360</min>
-     <max>360</max>
-     <scale>-1.0</scale>
-    </transformation>
-    <transformation>
-     <type>rotation</type>
-     <property>/radios/nav[0]/radials/selected-deg</property>
-     <min>-360</min>
-     <max>360.0</max>
-     <scale>1.0</scale>
-    </transformation>
-   </transformations>
-  </layer>
+ <layer>
+  <name>Nav1</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/hsi.rgb</path>
+   <x1>0.0</x1>
+   <y1>0.75</y1>
+   <x2>0.25</x2>
+   <y2>1.0</y2>
+  </texture>
+  <w>66</w>
+  <h>66</h>
+  <transformations>
+   <transformation>
+    <property alias="../../../../../params/heading-deg"/>
+    <type>rotation</type>
+    <scale>-1.0</scale>
+   </transformation>
+   <transformation>
+    <type>rotation</type>
+    <property>/radios/nav[0]/radials/selected-deg</property>
+    <type>rotation</type>
+    <scale>1.0</scale>
+   </transformation>
+  </transformations>
+ </layer>
 
-  <layer>
-   <name>Nav1_deviation</name>
-   <texture>
+ <layer>
+  <name>Nav1_deviation</name>
+  <texture>
    <path>Aircraft/Instruments/Textures/hsi.rgb</path>
    <x1>0.25</x1>
    <y1>0.75</y1>
    <x2>0.5</x2>
    <y2>1.0</y2>
-   </texture>
-   <w>66</w>
-   <h>66</h>
-   <transformations>
-    <transformation>
+  </texture>
+  <w>66</w>
+  <h>66</h>
+  <transformations>
+   <transformation>
+    <property alias="../../../../../params/heading-deg"/>   
     <type>rotation</type>
-    <property>/orientation/heading-magnetic-deg</property>
-    <min>-360</min>
-    <max>360</max>
     <scale>-1.0</scale>
    </transformation>
-    <transformation>
+   <transformation>
     <type>rotation</type>
     <property>/radios/nav[0]/radials/selected-deg</property>
-    <min>-360</min>
-    <max>360</max>
+    <type>rotation</type>   
     <scale>1.0</scale>
    </transformation>
    <transformation>
@@ -322,360 +246,355 @@ Started 24-7-01 by Timothy Gale
     <property>/radios/nav[0]/heading-needle-deflection</property>
     <min>-10.0</min>
     <max>10.0</max>
-    <scale>3.2</scale>
+    <scale>2.2</scale>
    </transformation>
   </transformations>
  </layer>
 
-  <layer>
-   <name>Plane</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-    <x1>0.5</x1>
-    <y1>0.734375</y1>
-    <x2>0.59375</x2>
-    <y2>0.828125</y2>
-   </texture>
-   <w>25</w>
-   <h>25</h>
-   <transformations>
-    <transformation>
-     <type>y-shift</type>
-     <offset>-6</offset>
-    </transformation>
-   </transformations>
-  </layer>
+ <layer>
+  <name>Plane</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+   <x1>0.5</x1>
+   <y1>0.734375</y1>
+   <x2>0.59375</x2>
+   <y2>0.828125</y2>
+  </texture>
+  <w>25</w>
+  <h>25</h>
+  <transformations>
+   <transformation>
+    <type>y-shift</type>
+    <offset>-6</offset>
+   </transformation>
+  </transformations>
+ </layer>
 
  <layer>
-   <name>hdgPointer</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/hsi.rgb</path>
-    <x1>0.920</x1>
-    <y1>0.9</y1>
-    <x2>.98</x2>
-    <y2>1.0</y2>
-   </texture>
-   <w>11</w>
-   <h>16</h>
-   <transformations>
-    <transformation>
-     <type>y-shift</type>
-     <offset>50</offset>
-    </transformation>
-   
-<transformation>
-     <type>x-shift</type>
-     <offset>-2</offset>
-    </transformation>
-   </transformations>
-
-</layer> 
+  <name>hdgPointer</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/hsi.rgb</path>
+   <x1>0.920</x1>
+   <y1>0.9</y1>
+   <x2>.98</x2>
+   <y2>1.0</y2>
+  </texture>
+  <w>11</w>
+  <h>16</h>
+  <transformations>
+   <transformation>
+    <type>y-shift</type>
+    <offset>50</offset>
+   </transformation>
+   <transformation>
+    <type>x-shift</type>
+    <offset>-2</offset>
+   </transformation>
+  </transformations>
+ </layer> 
  
-
  <!-- Copied from gyro.xml -->
-  <layer>
-   <name>heading bug</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-    <x1>0.9375</x1>
-    <y1>0.4375</y1>
-    <x2>1.0</x2>
-    <y2>0.5</y2>
-   </texture>
-   <w>12</w>
-   <h>12</h>
-   <transformations>
-    <transformation>
-     <type>rotation</type>
-     <property>/autopilot/settings/heading-bug-deg</property>
-     <min>-360.0</min>
-     <max>360.0</max>
-    </transformation>
-    <transformation>
-     <type>rotation</type>
-     <property>/orientation/heading-magnetic-deg</property>
-     <min>-360.0</min>
-     <max>360.0</max>
-     <scale>-1.0</scale>
-    </transformation>
-    <transformation>
-     <type>y-shift</type>
-     <offset>42</offset>
-    </transformation>
-   </transformations>
-  </layer>
+ <layer>
+  <name>heading bug</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+   <x1>0.9375</x1>
+   <y1>0.4375</y1>
+   <x2>1.0</x2>
+   <y2>0.5</y2>
+  </texture>
+  <w>12</w>
+  <h>12</h>
+  <transformations>
+   <transformation>
+    <type>rotation</type>
+    <property>/autopilot/settings/heading-bug-deg</property>
+   </transformation>
+   <transformation>
+    <type>rotation</type>
+    <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
+    <scale>-1.0</scale>
+   </transformation>
+   <transformation>
+    <type>y-shift</type>
+    <offset>42</offset>
+   </transformation>
+  </transformations>
+ </layer>
 
  <layer>
-   <name>glare shield</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/glareshield1.rgb</path>
-    <x1>0.0</x1>
-    <y1>0.0</y1>
-    <x2>1.0</x2>
-    <y2>1.0</y2>
-   </texture>
+  <name>glare shield</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/glareshield1.rgb</path>
+   <x1>0.0</x1>
+   <y1>0.0</y1>
+   <x2>1.0</x2>
+   <y2>1.0</y2>
+  </texture>
   <w>130</w>
   <h>134</h>
-   <transformations>
+  <transformations>
+   <transformation>
+    <type>x-shift</type>
+    <offset>-1</offset>
+   </transformation>
+<!--
    <transformation>
-     <type>x-shift</type>
-     <offset>-1</offset>
-    </transformation>
-<!--    <transformation>
     <type>y-shift</type>
-     <offset>-1</offset>
-    </transformation> -->
-    </transformations>
-  </layer>  
- <layer>
-   <name>Heading Knob</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/blister.rgb</path>
-    <x1>0.25</x1>
-    <y1>0.75</y1>
-    <x2>0.5</x2>
-    <y2>1.0</y2>
-   </texture>
-   <h>24</h>
-   <w>24</w>
-   <transformations>
-    <transformation>
-     <type>x-shift</type>
-     <offset>45</offset>
-    </transformation>
-    <transformation>
-     <type>y-shift</type>
-     <offset>-45</offset>
-    </transformation>
-    <transformation>
-     <type>rotation</type>
-     <offset>180</offset>
-    </transformation>
-   </transformations>
-  </layer>
-
-  <layer>
-   <name>Heading label</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-    <x1>0.0078125</x1>
-    <y1>0.5</y1>
-    <x2>0.1640625</x2>
-    <y2>0.6640625</y2>
-   </texture>
-   <w>15</w>
-   <h>15</h>
-   <transformations>
-    <transformation>
-     <type>x-shift</type>
-     <offset>45</offset>
-    </transformation>
-    <transformation>
-     <type>y-shift</type>
-     <offset>-45</offset>
-    </transformation>
-    <transformation>
-     <type>rotation</type>
-     <property>/autopilot/settings/heading-bug-deg</property>
-    </transformation>
-   </transformations>
-  </layer> 
+    <offset>-1</offset>
+   </transformation>
+-->
+  </transformations>
+ </layer>  
 
  <layer>
-   <name>OBS Knob</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/blister.rgb</path>
-    <x1>0.25</x1>
-    <y1>0.75</y1>
-    <x2>0.5</x2>
-    <y2>1.0</y2>
-   </texture>
-   <h>24</h>
-   <w>24</w>
-   <transformations>
-    <transformation>
-     <type>x-shift</type>
-     <offset>-45</offset>
-    </transformation>
-    <transformation>
-     <type>y-shift</type>
-     <offset>-45</offset>
-    </transformation>
-    <transformation>
-     <type>rotation</type>
-     <offset>180</offset>
-    </transformation>
-   </transformations>
-  </layer> 
+  <name>Heading Knob</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/blister.rgb</path>
+   <x1>0.25</x1>
+   <y1>0.75</y1>
+   <x2>0.5</x2>
+   <y2>1.0</y2>
+  </texture>
+  <h>24</h>
+  <w>24</w>
+  <transformations>
+   <transformation>
+    <type>x-shift</type>
+    <offset>45</offset>
+   </transformation>
+   <transformation>
+    <type>y-shift</type>
+    <offset>-45</offset>
+   </transformation>
+   <transformation>
+    <type>rotation</type>
+    <offset>180</offset>
+   </transformation>
+  </transformations>
+ </layer>
 
-  <layer>
-   <name>OBS label</name>
-   <texture>
-    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-    <x1>0.0078125</x1>
-    <y1>0.66015625</y1>
-    <x2>0.1640625</x2>
-    <y2>0.8242185</y2>
-   </texture>
-   <w>15</w>
-   <h>15</h>
-   <transformations>
-    <transformation>
-     <type>x-shift</type>
-     <offset>-45</offset>
-    </transformation>
-    <transformation>
-     <type>y-shift</type>
-     <offset>-45</offset>
-    </transformation>
-    <transformation>
-     <type>rotation</type>
-     <property>/radios/nav[0]/radials/selected-deg</property>
-     <min>0</min>
-     <max>360</max>
-    </transformation>
-   </transformations>
-  </layer> 
+ <layer>
+  <name>Heading label</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+   <x1>0.0078125</x1>
+   <y1>0.5</y1>
+   <x2>0.1640625</x2>
+   <y2>0.6640625</y2>
+  </texture>
+  <w>15</w>
+  <h>15</h>
+  <transformations>
+   <transformation>
+    <type>x-shift</type>
+    <offset>45</offset>
+   </transformation>
+   <transformation>
+    <type>y-shift</type>
+    <offset>-45</offset>
+   </transformation>
+   <transformation>
+    <type>rotation</type>
+    <property>/autopilot/settings/heading-bug-deg</property>
+   </transformation>
+  </transformations>
+ </layer> 
 
-</layers> 
- <actions>
-   <action>
-    <name>OBS small clockwise rotation</name>
-    <button>0</button>
-    <x>-56</x>
-    <y>-56</y>
-    <w>12</w>
-    <h>24</h>
-    <binding>
-    <command>property-adjust</command>
+ <layer>
+  <name>OBS Knob</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/blister.rgb</path>
+   <x1>0.25</x1>
+   <y1>0.75</y1>
+   <x2>0.5</x2>
+   <y2>1.0</y2>
+  </texture>
+  <h>24</h>
+  <w>24</w>
+  <transformations>
+   <transformation>
+    <type>x-shift</type>
+    <offset>-45</offset>
+   </transformation>
+   <transformation>
+    <type>y-shift</type>
+    <offset>-45</offset>
+   </transformation>
+   <transformation>
+    <type>rotation</type>
+    <offset>180</offset>
+   </transformation>
+  </transformations>
+ </layer> 
+
+ <layer>
+  <name>OBS label</name>
+  <texture>
+   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+   <x1>0.0078125</x1>
+   <y1>0.66015625</y1>
+   <x2>0.1640625</x2>
+   <y2>0.8242185</y2>
+  </texture>
+  <w>15</w>
+  <h>15</h>
+  <transformations>
+   <transformation>
+    <type>x-shift</type>
+    <offset>-45</offset>
+   </transformation>
+   <transformation>
+    <type>y-shift</type>
+    <offset>-45</offset>
+   </transformation>
+   <transformation>
+    <type>rotation</type>
     <property>/radios/nav[0]/radials/selected-deg</property>
-    <step>-1.0</step>
     <min>0</min>
     <max>360</max>
-    <wrap>1</wrap>
-    </binding>
-  </action> 
+   </transformation>
+  </transformations>
+ </layer> 
+</layers> 
+
+<actions>
+ <action>
+  <name>OBS small clockwise rotation</name>
+  <button>0</button>
+  <x>-56</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
+   <command>property-adjust</command>
+   <property>/radios/nav[0]/radials/selected-deg</property>
+   <step>-1.0</step>
+   <min>0</min>
+   <max>360</max>
+   <wrap>1</wrap>
+  </binding>
+ </action> 
 
  <action>
-   <name>OBS large clockwise rotation</name>
-   <button>1</button>
-   <x>-56</x>
-   <y>-56</y>
-   <w>12</w>
-   <h>24</h>
-   <binding>
+  <name>OBS large clockwise rotation</name>
+  <button>1</button>
+  <x>-56</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
    <command>property-adjust</command>
    <property>/radios/nav[0]/radials/selected-deg</property>
    <step>-5.0</step>
    <min>0</min>
    <max>360</max>
    <wrap>1</wrap>
-   </binding>
-  </action>
+  </binding>
+ </action>
 
-  <action>
-   <name>OBS small counter-clockwise rotation</name>
-   <button>0</button>
-   <x>-46</x>
-   <y>-56</y>
-   <w>12</w>
-   <h>24</h>
-   <binding>
+ <action>
+  <name>OBS small counter-clockwise rotation</name>
+  <button>0</button>
+  <x>-46</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
    <command>property-adjust</command>
    <property>/radios/nav[0]/radials/selected-deg</property>
    <step>1.0</step>
    <min>0</min>
    <max>360</max>
    <wrap>1</wrap>
-   </binding>
-  </action>
+  </binding>
+ </action>
 
-  <action>
-    <name>OBS large counter-clockwise rotation</name>
-    <button>1</button>
-    <x>-46</x>
-    <y>-56</y>
-    <w>12</w>
-    <h>24</h>
-    <binding>
-    <command>property-adjust</command>
-    <property>/radios/nav[0]/radials/selected-deg</property>
-    <step>5.0</step>
-    <min>0</min>
-    <max>360</max>
-    <wrap>1</wrap>
-    </binding>
-  </action>
+ <action>
+  <name>OBS large counter-clockwise rotation</name>
+  <button>1</button>
+  <x>-46</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
+   <command>property-adjust</command>
+   <property>/radios/nav[0]/radials/selected-deg</property>
+   <step>5.0</step>
+   <min>0</min>
+   <max>360</max>
+   <wrap>1</wrap>
+  </binding>
+ </action>
 
-  <action>
-    <name>Heading hold small clockwise rotation</name>
-    <button>0</button>
-    <x>36</x>
-    <y>-56</y>
-    <w>12</w>
-    <h>24</h>
-    <binding>
-    <command>property-adjust</command>
-    <property>/autopilot/settings/heading-bug-deg</property>
-    <step>-1.0</step>
-    <min>0</min>
-    <max>360</max>
-    <wrap>1</wrap>
-    </binding>
-  </action>
+ <action>
+  <name>Heading hold small clockwise rotation</name>
+  <button>0</button>
+  <x>36</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
+   <command>property-adjust</command>
+   <property>/autopilot/settings/heading-bug-deg</property>
+   <step>-1.0</step>
+   <min>0</min>
+   <max>360</max>
+   <wrap>1</wrap>
+  </binding>
+ </action>
 
-  <action>
-    <name>Heading hold large clockwise rotation</name>
-    <button>1</button>
-    <x>36</x>
-    <y>-56</y>
-    <w>12</w>
-    <h>24</h>
-    <binding>
-    <command>property-adjust</command>
-    <property>/autopilot/settings/heading-bug-deg</property>
-    <step>-5.0</step>
-    <min>0</min>
-    <max>360</max>
-    <wrap>1</wrap>
-    </binding>
-  </action>
+ <action>
+  <name>Heading hold large clockwise rotation</name>
+  <button>1</button>
+  <x>36</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
+   <command>property-adjust</command>
+   <property>/autopilot/settings/heading-bug-deg</property>
+   <step>-5.0</step>
+   <min>0</min>
+   <max>360</max>
+   <wrap>1</wrap>
+  </binding>
+ </action>
 
-  <action>
-    <name>Heading hold  small counter-clockwise rotation</name>
-    <button>0</button>
-    <x>46</x>
-    <y>-56</y>
-    <w>12</w>
-    <h>24</h>
-    <binding>
-    <command>property-adjust</command>
-    <property>/autopilot/settings/heading-bug-deg</property>
-    <step>1.0</step>
-    <min>0</min>
-    <max>360</max>
-    <wrap>1</wrap>
-    </binding>
-  </action>
+ <action>
+  <name>Heading hold  small counter-clockwise rotation</name>
+  <button>0</button>
+  <x>46</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
+   <command>property-adjust</command>
+   <property>/autopilot/settings/heading-bug-deg</property>
+   <step>1.0</step>
+   <min>0</min>
+   <max>360</max>
+   <wrap>1</wrap>
+  </binding>
+ </action>
 
-  <action>
-    <name>Heading hold large counter-clockwise rotation</name>
-    <button>1</button>
-    <x>46</x>
-    <y>-56</y>
-    <w>12</w>
-    <h>24</h>
-    <binding>
-    <command>property-adjust</command>
-    <property>/autopilot/settings/heading-bug-deg</property>
-    <step>5.0</step>
-    <min>0</min>
-    <max>360</max>
-    <wrap>1</wrap>
-    </binding>
-    </action>
-  </actions>
+ <action>
+  <name>Heading hold large counter-clockwise rotation</name>
+  <button>1</button>
+  <x>46</x>
+  <y>-56</y>
+  <w>12</w>
+  <h>24</h>
+  <binding>
+   <command>property-adjust</command>
+   <property>/autopilot/settings/heading-bug-deg</property>
+   <step>5.0</step>
+   <min>0</min>
+   <max>360</max>
+   <wrap>1</wrap>
+  </binding>
+ </action>
+</actions>
 
 </PropertyList>
 
-
diff --git a/Aircraft/c310-ifr-set.xml b/Aircraft/c310-ifr-set.xml
index c8b03bde1..beb160d3d 100644
--- a/Aircraft/c310-ifr-set.xml
+++ b/Aircraft/c310-ifr-set.xml
@@ -14,6 +14,13 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
 
  <sim>
 
+<!-- This is temporary fix to electric system till adf and dme are added to c310 -->
+  <systems>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems> 
+
   <description>Cessna 310 with IFR panel</description>
 
   <panel>