diff --git a/A320-main.xml b/A320-main.xml
index bd060a1d..c77ca273 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -746,6 +746,13 @@
 	</services>
 	
 	<systems>
+		<electrical n="0">
+			<bus n="0">
+				<dc-ess>0</dc-ess>
+				<dc1>0</dc1>
+				<dc2>0</dc2>
+			</bus>
+		</electrical>
 		<failures n="0">
 			<aileron-left type="bool">0</aileron-left>
 			<aileron-right type="bool">0</aileron-right>
diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml
index 8db29c59..fe71d820 100644
--- a/Models/Instruments/Radio/Radio1.xml
+++ b/Models/Instruments/Radio/Radio1.xml
@@ -8,7 +8,7 @@
 
 <PropertyList>
 
-	<path>res/Radio1.ac</path>
+	<path>res/Radio.ac</path>
 
 	<!-- On Switch -->
 	<animation>
@@ -1027,48 +1027,10 @@
 						<property>controls/radio/rmp[0]/on</property>
 						<value>1</value>
 					</equals>
-					<or>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">vhf2</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">hf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">hf2</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">vhf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">hf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">hf2</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[2]/sel_chan</property>
-							<value type="string">vhf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[2]/sel_chan</property>
-							<value type="string">vhf2</value>
-						</equals>
-					</or>
+					<equals>
+						<property>systems/radio/rmp[0]/sel-light</property>
+						<value>1</value>
+					</equals>
 				</and>
 			</or>
 		</condition>
@@ -1390,18 +1352,6 @@
 					<property>systems/electrical/bus/dc-ess</property>
 					<value>25</value>
 				</greater-than-equals>
-				<not>
-					<and>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</not>
 			</and>
 		</condition>
 	</animation>
@@ -1431,61 +1381,6 @@
 		</font-resolution>
 	</text>
 
-	<!-- VHF3 Data Mode-->
-	<animation>
-		<type>select</type>
-		<object-name>rmp-active-vhf3-data</object-name>
-		<condition>
-			<and>
-				<not-equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</not-equals>
-				<equals>
-					<property>controls/radio/rmp[0]/on</property>
-					<value>1</value>
-				</equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-ess</property>
-					<value>25</value>
-				</greater-than-equals>
-				<equals>
-					<property>systems/radio/rmp[0]/sel_chan</property>
-					<value type="string">vhf3</value>
-				</equals>
-				<equals>
-					<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
-					<value>0</value>
-				</equals>
-			</and>
-		</condition>
-	</animation>
-
-	<text>
-		<name>rmp-active-vhf3-data</name>
-		<offsets>
-			<x-m>-0.23205</x-m>
-			<y-m>-0.21625</y-m>
-			<z-m>-0.12582</z-m>
-			<heading-deg>90</heading-deg>
-		</offsets>
-		<alignment>center-center</alignment>
-		<axis-alignment>xy-plane</axis-alignment>
-		<type type="string">text-value</type>
-		<format type="string">data</format>
-		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
-		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
-		<character-size>0.008</character-size>
-		<font-resolution>
-			<width type="int">32</width>
-			<height type="int">32</height>
-		</font-resolution>
-	</text>
-
 	<!-- Test Illumination-->
 	<animation>
 		<type>select</type>
@@ -1541,18 +1436,6 @@
 					<property>systems/electrical/bus/dc-ess</property>
 					<value>25</value>
 				</greater-than-equals>
-				<not>
-					<and>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/vhf3-standby</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</not>
 			</and>
 		</condition>
 	</animation>
@@ -1582,61 +1465,6 @@
 		</font-resolution>
 	</text>
 
-	<!-- VHF3 Data Mode-->
-	<animation>
-		<type>select</type>
-		<object-name>rmp-standby-vhf3-data</object-name>
-		<condition>
-			<and>
-				<not-equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</not-equals>
-				<equals>
-					<property>controls/radio/rmp[0]/on</property>
-					<value>1</value>
-				</equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-ess</property>
-					<value>25</value>
-				</greater-than-equals>
-				<equals>
-					<property>systems/radio/rmp[0]/sel_chan</property>
-					<value type="string">vhf3</value>
-				</equals>
-				<equals>
-					<property>systems/radio/rmp[0]/vhf3-standby</property>
-					<value>0</value>
-				</equals>
-			</and>
-		</condition>
-	</animation>
-
-	<text>
-		<name>rmp-standby-vhf3-data</name>
-		<offsets>
-			<x-m>-0.23205</x-m>
-			<y-m>-0.14896</y-m>
-			<z-m>-0.12582</z-m>
-			<heading-deg>90</heading-deg>
-		</offsets>
-		<alignment>center-center</alignment>
-		<axis-alignment>xy-plane</axis-alignment>
-		<type type="string">text-value</type>
-		<format type="string">data</format>
-		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
-		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
-		<character-size>0.008</character-size>
-		<font-resolution>
-			<width type="int">32</width>
-			<height type="int">32</height>
-		</font-resolution>
-	</text>
-
 	<!-- Test Illumination-->
 	<animation>
 		<type>select</type>
@@ -1679,10 +1507,8 @@
 		<type>material</type>
 		<object-name>rmp-active</object-name>
 		<object-name>rmp-active-test</object-name>
-		<object-name>rmp-active-vhf3-data</object-name>
 		<object-name>rmp-standby</object-name>
 		<object-name>rmp-standby-test</object-name>
-		<object-name>rmp-standby-vhf3-data</object-name>
 		<diffuse>
 			<red>0.89</red>
 			<green>0.37</green>
diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml
index 16e893b9..fdbc2b73 100644
--- a/Models/Instruments/Radio/Radio2.xml
+++ b/Models/Instruments/Radio/Radio2.xml
@@ -8,7 +8,7 @@
 
 <PropertyList>
 
-	<path>res/Radio1.ac</path>
+	<path>res/Radio.ac</path>
 
 	<!-- On Switch -->
 	<animation>
@@ -56,7 +56,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -83,7 +83,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -110,7 +110,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -137,7 +137,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -164,7 +164,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -190,7 +190,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -222,11 +222,11 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>rmp.transfer(2);</script>
+				<script>rmp.transfer(1);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -253,7 +253,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -280,7 +280,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -307,7 +307,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -329,9 +329,9 @@
 				<command>property-adjust</command>
 				<property>systems/radio/rmp[1]/vhf3-standby</property>
 				<step>0.025</step>
+				<resolution>0.025</resolution>
 				<min>0.0</min>
 				<max>1.0</max>
-				<resolution>0.025</resolution>
 				<wrap>true</wrap>
 				<mask>decimal</mask>
 			</binding>
@@ -340,7 +340,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -365,7 +365,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -396,7 +396,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -423,7 +423,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -439,9 +439,9 @@
 				<command>property-adjust</command>
 				<property>systems/radio/rmp[1]/vhf2-standby</property>
 				<step>-0.025</step>
-				<resolution>0.025</resolution>
 				<min>0.0</min>
 				<max>1.0</max>
+				<resolution>0.025</resolution>
 				<wrap>true</wrap>
 				<mask>decimal</mask>
 			</binding>
@@ -450,7 +450,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -472,9 +472,9 @@
 				<command>property-adjust</command>
 				<property>systems/radio/rmp[1]/vhf3-standby</property>
 				<step>-0.025</step>
-				<resolution>0.025</resolution>
 				<min>0.0</min>
 				<max>1.0</max>
+				<resolution>0.025</resolution>
 				<wrap>true</wrap>
 				<mask>decimal</mask>
 			</binding>
@@ -483,7 +483,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -508,7 +508,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -543,7 +543,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -569,7 +569,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -595,7 +595,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -627,7 +627,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -653,7 +653,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -685,7 +685,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -711,7 +711,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -737,7 +737,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -769,7 +769,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -795,7 +795,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -867,7 +867,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -898,7 +898,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -928,7 +928,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -958,7 +958,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -987,7 +987,7 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc2</property>
+							<property>systems/electrical/bus/dc-ess</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -1020,55 +1020,17 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
 						<property>controls/radio/rmp[1]/on</property>
 						<value>1</value>
 					</equals>
-					<or>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">vhf2</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">hf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[0]/sel_chan</property>
-							<value type="string">hf2</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">vhf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">hf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">hf2</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[2]/sel_chan</property>
-							<value type="string">vhf1</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[2]/sel_chan</property>
-							<value type="string">vhf2</value>
-						</equals>
-					</or>
+					<equals>
+						<property>systems/radio/rmp[1]/sel-light</property>
+						<value>1</value>
+					</equals>
 				</and>
 			</or>
 		</condition>
@@ -1086,7 +1048,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1113,7 +1075,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1140,7 +1102,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1167,7 +1129,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1194,7 +1156,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1221,7 +1183,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1248,7 +1210,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1275,7 +1237,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1302,7 +1264,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1329,7 +1291,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1356,7 +1318,7 @@
 				</equals>
 				<and>
 					<greater-than-equals>
-						<property>systems/electrical/bus/dc2</property>
+						<property>systems/electrical/bus/dc-ess</property>
 						<value>25</value>
 					</greater-than-equals>
 					<equals>
@@ -1387,21 +1349,9 @@
 					<value>1</value>
 				</equals>
 				<greater-than-equals>
-					<property>systems/electrical/bus/dc2</property>
+					<property>systems/electrical/bus/dc-ess</property>
 					<value>25</value>
 				</greater-than-equals>
-				<not>
-					<and>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</not>
 			</and>
 		</condition>
 	</animation>
@@ -1431,61 +1381,6 @@
 		</font-resolution>
 	</text>
 
-	<!-- VHF3 Data Mode-->
-	<animation>
-		<type>select</type>
-		<object-name>rmp-active-vhf3-data</object-name>
-		<condition>
-			<and>
-				<not-equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</not-equals>
-				<equals>
-					<property>controls/radio/rmp[1]/on</property>
-					<value>1</value>
-				</equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc2</property>
-					<value>25</value>
-				</greater-than-equals>
-				<equals>
-					<property>systems/radio/rmp[1]/sel_chan</property>
-					<value type="string">vhf3</value>
-				</equals>
-				<equals>
-					<property>instrumentation/comm[2]/frequencies/selected-mhz</property>
-					<value>0</value>
-				</equals>
-			</and>
-		</condition>
-	</animation>
-
-	<text>
-		<name>rmp-active-vhf3-data</name>
-		<offsets>
-			<x-m>-0.23205</x-m>
-			<y-m>-0.21625</y-m>
-			<z-m>-0.12582</z-m>
-			<heading-deg>90</heading-deg>
-		</offsets>
-		<alignment>center-center</alignment>
-		<axis-alignment>xy-plane</axis-alignment>
-		<type type="string">text-value</type>
-		<format type="string">data</format>
-		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
-		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
-		<character-size>0.008</character-size>
-		<font-resolution>
-			<width type="int">32</width>
-			<height type="int">32</height>
-		</font-resolution>
-	</text>
-
 	<!-- Test Illumination-->
 	<animation>
 		<type>select</type>
@@ -1538,21 +1433,9 @@
 					<value>1</value>
 				</equals>
 				<greater-than-equals>
-					<property>systems/electrical/bus/dc2</property>
+					<property>systems/electrical/bus/dc-ess</property>
 					<value>25</value>
 				</greater-than-equals>
-				<not>
-					<and>
-						<equals>
-							<property>systems/radio/rmp[1]/sel_chan</property>
-							<value type="string">vhf3</value>
-						</equals>
-						<equals>
-							<property>systems/radio/rmp[1]/vhf3-standby</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</not>
 			</and>
 		</condition>
 	</animation>
@@ -1582,61 +1465,6 @@
 		</font-resolution>
 	</text>
 
-	<!-- VHF3 Data Mode-->
-	<animation>
-		<type>select</type>
-		<object-name>rmp-standby-vhf3-data</object-name>
-		<condition>
-			<and>
-				<not-equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</not-equals>
-				<equals>
-					<property>controls/radio/rmp[1]/on</property>
-					<value>1</value>
-				</equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc2</property>
-					<value>25</value>
-				</greater-than-equals>
-				<equals>
-					<property>systems/radio/rmp[1]/sel_chan</property>
-					<value type="string">vhf3</value>
-				</equals>
-				<equals>
-					<property>systems/radio/rmp[1]/vhf3-standby</property>
-					<value>0</value>
-				</equals>
-			</and>
-		</condition>
-	</animation>
-
-	<text>
-		<name>rmp-standby-vhf3-data</name>
-		<offsets>
-			<x-m>-0.23205</x-m>
-			<y-m>-0.14896</y-m>
-			<z-m>-0.12582</z-m>
-			<heading-deg>90</heading-deg>
-		</offsets>
-		<alignment>center-center</alignment>
-		<axis-alignment>xy-plane</axis-alignment>
-		<type type="string">text-value</type>
-		<format type="string">data</format>
-		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
-		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
-		<character-size>0.008</character-size>
-		<font-resolution>
-			<width type="int">32</width>
-			<height type="int">32</height>
-		</font-resolution>
-	</text>
-
 	<!-- Test Illumination-->
 	<animation>
 		<type>select</type>
@@ -1679,10 +1507,8 @@
 		<type>material</type>
 		<object-name>rmp-active</object-name>
 		<object-name>rmp-active-test</object-name>
-		<object-name>rmp-active-vhf3-data</object-name>
 		<object-name>rmp-standby</object-name>
 		<object-name>rmp-standby-test</object-name>
-		<object-name>rmp-standby-vhf3-data</object-name>
 		<diffuse>
 			<red>0.89</red>
 			<green>0.37</green>
diff --git a/Models/Instruments/Radio/res/Radio1.ac b/Models/Instruments/Radio/res/Radio.ac
similarity index 100%
rename from Models/Instruments/Radio/res/Radio1.ac
rename to Models/Instruments/Radio/res/Radio.ac
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 1d1ebfc3..11d7258a 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -32,6 +32,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2);
 ##########
 # Lights #
 ##########
+
 var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2);
 var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.1, 1], "/controls/lighting/beacon");
 var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2);
@@ -208,6 +209,7 @@ var systemsLoop = maketimer(0.1, func {
 	libraries.BUTTONS.update();
 	fadec.FADEC.loop();
 	ecam.ECAM_controller.loop();
+	rmp.rmpUpdate();
 	
 	if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/switches/cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or getprop("/controls/gear/brake-parking") == 0)) {
 		setprop("/controls/switches/cart", 0);
diff --git a/Nasal/rmp.nas b/Nasal/rmp.nas
index 6d7aae88..e30dd3bd 100644
--- a/Nasal/rmp.nas
+++ b/Nasal/rmp.nas
@@ -7,29 +7,31 @@
 
 # GLOBAL TODO add stuff for HF1, HF2, VOR, LS and ADF
 
-var rmp_update = nil;
+var chan_rmp1_v = "vhr1";
+var chan_rmp2_v = "vhr2";
+var chan_rmp3_v = "vhr3";
 
 var act_vhf1 = props.globals.getNode("/instrumentation/comm[0]/frequencies/selected-mhz");
 var act_vhf2 = props.globals.getNode("/instrumentation/comm[1]/frequencies/selected-mhz");
 var act_vhf3 = props.globals.getNode("/instrumentation/comm[2]/frequencies/selected-mhz");
 
-var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "123.900", "STRING");
-var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "118.700", "STRING");
-var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 118.7, "DOUBLE");
-var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 123.12, "DOUBLE");
-var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 121.5, "DOUBLE");
+var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "118.700", "STRING");
+var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "121.400", "STRING");
+var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 121.4, "DOUBLE");
+var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 122.6, "DOUBLE");
+var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 123.2, "DOUBLE");
 
-var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "127.900", "STRING");
-var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "123.125", "STRING");
-var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 118.7, "DOUBLE");
-var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 123.12, "DOUBLE");
-var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 121.5, "DOUBLE");
+var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "119.400", "STRING");
+var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "122.600", "STRING");
+var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 121.4, "DOUBLE");
+var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 122.6, "DOUBLE");
+var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 123.2, "DOUBLE");
 
-var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "127.900", "STRING");
-var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.125", "STRING");
-var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 118.7, "DOUBLE");
-var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 123.12, "DOUBLE");
-var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 121.5, "DOUBLE");
+var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "data", "STRING");
+var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.200", "STRING");
+var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 121.4, "DOUBLE");
+var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 122.6, "DOUBLE");
+var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 123.2, "DOUBLE");
 
 var chan_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel_chan", "vhf1", "STRING");
 var chan_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel_chan", "vhf2", "STRING");
@@ -39,6 +41,14 @@ var pwr_sw_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/on", 0, "BOOL")
 var pwr_sw_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/on", 0, "BOOL");
 var pwr_sw_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/on", 0, "BOOL");
 
+var sel_light_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel-light", 0, "BOOL");
+var sel_light_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel-light", 0, "BOOL");
+var sel_light_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/sel-light", 0, "BOOL");
+
+var am_mode_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/am-active", 0, "BOOL");
+var am_mode_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/am-active", 0, "BOOL");
+var am_mode_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/am-active", 0, "BOOL");
+
 var init = func() {
 	for(var i = 0; i < 3; i += 1) {
 		setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510);
@@ -51,10 +61,48 @@ var init = func() {
 	pwr_sw_rmp1.setBoolValue(0);
 	pwr_sw_rmp2.setBoolValue(0);
 	pwr_sw_rmp3.setBoolValue(0);
+}
+
+var rmpUpdate = func() {
+	chan_rmp1_v = chan_rmp1.getValue();
+	chan_rmp2_v = chan_rmp2.getValue();
+	chan_rmp3_v = chan_rmp3.getValue();
 	
-	var rmp_update = maketimer(0.2, func {
-		rmp_refresh.update();
-	});
+	# SEL lights
+	if (chan_rmp1_v == "vhf2" or chan_rmp1_v == "vhf3" or chan_rmp1_v == "hf1" or chan_rmp1_v == "hf2" or chan_rmp2_v == "vhf1" or chan_rmp2_v == "vhf3" or chan_rmp2_v == "hf1" or chan_rmp2_v == "hf2" or chan_rmp3_v == "vhf1" or chan_rmp3_v == "vhf2") {
+		if (sel_light_rmp1.getBoolValue() != 1) {
+			sel_light_rmp1.setBoolValue(1);
+		}
+		if (sel_light_rmp2.getBoolValue() != 1) {
+			sel_light_rmp2.setBoolValue(1);
+		}
+		if (sel_light_rmp3.getBoolValue() != 1) {
+			sel_light_rmp3.setBoolValue(1);
+		}
+	} else {
+		if (sel_light_rmp1.getBoolValue() != 0) {
+			sel_light_rmp1.setBoolValue(0);
+		}
+		if (sel_light_rmp2.getBoolValue() != 0) {
+			sel_light_rmp2.setBoolValue(0);
+		}
+		if (sel_light_rmp3.getBoolValue() != 0) {
+			sel_light_rmp3.setBoolValue(0);
+		}
+	}
+	
+	# Disable AM mode if not in HF
+	if (chan_rmp1_v != "hf1" and chan_rmp1_v != "hf2" and am_mode_rmp1.getBoolValue() == 1) {
+		am_mode_rmp1.setBoolValue(0);
+	}
+	
+	if (chan_rmp2_v != "hf1" and chan_rmp2_v != "hf2" and am_mode_rmp2.getBoolValue() == 1) {
+		am_mode_rmp2.setBoolValue(0);
+	}
+	
+	if (chan_rmp3_v != "hf1" and chan_rmp3_v != "hf2" and am_mode_rmp3.getBoolValue() == 1) {
+		am_mode_rmp3.setBoolValue(0);
+	}
 }
 
 var update_active_vhf = func(vhf) {
@@ -85,15 +133,23 @@ var update_active_vhf = func(vhf) {
 				act_display_rmp2.setValue(act);
 			}
 		}
-	} else {
+	} else if (vhf == 3) {
 		if (sel1 == "vhf3" or sel2 == "vhf3") {
 			var act = sprintf("%3.3f", act_vhf3.getValue());
 
 			if (sel1 == "vhf3") {
-				act_display_rmp1.setValue(act);
+				if (act == 0) {
+					act_display_rmp1.setValue("data");
+				} else {
+					act_display_rmp1.setValue(act);
+				}
 			}
 			if (sel2 == "vhf3") {
-				act_display_rmp2.setValue(act);
+				if (act == 0) {
+					act_display_rmp2.setValue("data");
+				} else {
+					act_display_rmp2.setValue(act);
+				}
 			}
 		}
 	}
@@ -132,7 +188,7 @@ var update_chan_sel = func(rmp_no) {
 		var chan = chan_rmp1.getValue();
 		if (chan == "vhf1") {
 			update_stby_vhf(rmp_no, 1);
-		} else if (chan == "vhf1") {
+		} else if (chan == "vhf2") {
 			update_stby_vhf(rmp_no, 2);
 		} else {
 			update_stby_vhf(rmp_no, 3);
@@ -160,7 +216,6 @@ var update_chan_sel = func(rmp_no) {
 }
 
 var transfer = func(rmp_no) {
-
 	rmp_no = rmp_no - 1;
 	var sel_chan = getprop("/systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan");
 
diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index 9b273081..64ca89e1 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -456,11 +456,11 @@
 					<property>/autopilot/route-manager/wp[0]/true-bearing-deg</property>
 					<product>
 						<property>/it-autoflight/internal/drift-angle-deg</property>
-						<value>-1</value>
+						<value>-1.0</value>
 					</product>
 					<product>
 						<property>/orientation/heading-deg</property>
-						<value>-1</value>
+						<value>-1.0</value>
 					</product>
 				</sum>
 			</expression>
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index fa3398f4..3ae2b94c 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -57,7 +57,7 @@
 			<Ki>-0.000001</Ki>
 			<min>
 				<property>/it-autoflight/internal/bank-limit</property>
-				<scale>-1</scale>
+				<scale>-1.0</scale>
 			</min>
 			<max>/it-autoflight/internal/bank-limit</max>
 		</config>
@@ -102,7 +102,7 @@
 			<Ki>-0.0001</Ki>
 			<min>
 				<property>/it-autoflight/internal/bank-limit</property>
-				<scale>-1</scale>
+				<scale>-1.0</scale>
 			</min>
 			<max>/it-autoflight/internal/bank-limit</max>
 		</config>
@@ -139,7 +139,7 @@
 		<output>/it-autoflight/internal/target-roll-deg</output>
 		<min>
 			<property>/it-autoflight/internal/bank-limit</property>
-			<scale>-1</scale>
+			<scale>-1.0</scale>
 		</min>
 		<max>/it-autoflight/internal/bank-limit</max>
 	</filter>
diff --git a/revision.txt b/revision.txt
index 607f57d7..a5e41183 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4681
\ No newline at end of file
+4683
\ No newline at end of file