diff --git a/A320-main.xml b/A320-main.xml
index 970579b9..463b6b07 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1137,6 +1137,7 @@
 				<ditching type="int">0</ditching>
 				<elecratman type="int">0</elecratman>
 				<emercall type="int">0</emercall>
+				<emergentest type="int">0</emergentest>
 				<eng1-manstart type="int">0</eng1-manstart>
 				<eng2-manstart type="int">0</eng2-manstart>
 				<eng1-n1 type="int">0</eng1-n1>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 98511383..1dc8a2c5 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -15100,6 +15100,260 @@
 		</hovered>
 	</animation>
 	
+	<!-- Emer Gen Panel -->
+	<animation>
+		<type>knob</type>
+		<object-name>EmerGenTestGuard</object-name>
+		<property>controls/OH/protectors/emergentest-pos</property>
+		<factor>-145</factor>
+		<axis>
+			<object-name>EmerGenTestGuard.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/OH/protectors/emergentest</property>
+				<value>0</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/btn1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>emergentest-guard-lbl</tooltip-id>
+				<label>Emer Gen test button guard</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>EmerGenTest</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-assign</command>
+				<property>controls/electrical/switches/emer-gen-test</property>
+				<value>1</value>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/btn1", 1);</script>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>controls/electrical/switches/emer-gen-test</property>
+					<value>0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>emergentest-lbl</tooltip-id>
+				<label>Emer Gen test button</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>translate</type>
+		<object-name>EmerGenTest</object-name>
+		<property>controls/electrical/switches/emer-gen-test</property>
+		<factor>-0.00075</factor>
+		<axis>
+			<x1-m>-0.134358</x1-m>
+			<y1-m>-0.259398</y1-m>
+			<z1-m>0.892231</z1-m>
+			<x2-m>-0.133481</x2-m>
+			<y2-m>-0.259101</y2-m>
+			<z2-m>0.889991</z2-m>
+		</axis>
+	</animation>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>Gen1LineBtn</object-name>
+		<object-name>Gen1LineBtn1S</object-name>
+		<object-name>Gen1LineBtn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-ess</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+				<command>property-toggle</command>
+				<property>controls/electrical/switches/gen-1-line-contactor</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+			<binding>
+				<command>property-assign</command>
+				<property>controls/cockpit/genlinecontactor-translate</property>
+				<value>-0.00075</value>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>controls/cockpit/genlinecontactor-translate</property>
+					<value>0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gen-1-glc-lbl</tooltip-id>
+				<label>Gen 1 line contactor</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>translate</type>
+		<object-name>Gen1LineBtn</object-name>
+		<object-name>Gen1LineBtn1S</object-name>
+		<object-name>Gen1LineBtn2O</object-name>
+		<property>controls/cockpit/genlinecontactor-translate</property>
+		<axis>
+			<x1-m>-0.134358</x1-m>
+			<y1-m>-0.259398</y1-m>
+			<z1-m>0.892231</z1-m>
+			<x2-m>-0.133481</x2-m>
+			<y2-m>-0.259101</y2-m>
+			<z2-m>0.889991</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>Gen1LineBtn2O</object-name>
+		<condition>
+			<and>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
+				<or>
+					<property>controls/electrical/switches/gen-1-line-contactor</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+			</and>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>EmerGenInd1F</object-name>
+		<condition>
+			<and>
+				<or>
+					<property>systems/electrical/light/rat-emer-gen-fault</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+			</and>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>EmerElecManOnBtn</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-hot-1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+				<command>property-assign</command>
+				<property>controls/electrical/switches/emer-elec-man-on</property>
+				<value>1</value>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>=
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>controls/electrical/switches/emer-elec-man-on</property>
+					<value>0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>emergendeploy-lbl</tooltip-id>
+				<label>Deploy RAT</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>translate</type>
+		<object-name>EmerElecManOnBtn</object-name>
+		<property>controls/electrical/switches/emer-elec-man-on</property>
+		<factor>-0.00075</factor>
+		<axis>
+			<x1-m>-0.134358</x1-m>
+			<y1-m>-0.259398</y1-m>
+			<z1-m>0.892231</z1-m>
+			<x2-m>-0.133481</x2-m>
+			<y2-m>-0.259101</y2-m>
+			<z2-m>0.889991</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>knob</type>
+		<object-name>EmerManOnGuard</object-name>
+		<property>controls/OH/protectors/elecratman-pos</property>
+		<factor>-145</factor>
+		<axis>
+			<object-name>EmerManOnGuard.axis</object-name>
+		</axis>
+		<action>
+			<button>0</button>
+			<binding>
+				<command>property-toggle</command>
+				<property>controls/OH/protectors/elecratman</property>
+			</binding>
+			<binding>
+				<condition>
+					<not>
+						<property>controls/OH/protectors/elecratman</property>
+					</not>
+				</condition>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/btn1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>emergendeployguard-lbl</tooltip-id>
+				<label>RAT guard</label>
+			</binding>
+		</hovered>
+	</animation>
+	
 	<!-- Oxygen -->
 	<animation>
 		<type>knob</type>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 0736c677..18c8afc1 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -1202,274 +1202,12 @@
 		<object-name>IDG2Btn1F</object-name>
 		<condition>
 			<or>
-				<equals>
-					<property>systems/electrical/light/idg-2-fault</property>
-					<value>1</value>
-				</equals>
+				<property>systems/electrical/light/idg-2-fault</property>
 				<property>controls/switches/annun-test</property>
 			</or>
 		</condition>
 	</animation>
 
-	<animation>
-		<name>Emer Gen Test pick</name>
-		<type>pick</type>
-		<object-name>EmerGenTest</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<and>
-						<equals>
-							<property>controls/OH/protectors/emergentest</property>
-							<value>1</value>
-						</equals>
-					</and>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/electrical/switches/emer-gen-test</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/OH/protectors/emergentest</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<mod-up>
-				<binding>
-					<condition>
-						<equals>
-							<property>controls/OH/protectors/emergentest</property>
-							<value>1</value>
-						</equals>
-					</condition>
-					<command>property-assign</command>
-					<property>controls/electrical/switches/emer-gen-test</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<command>property-assign</command>
-					<property>controls/OH/protectors/emergentest</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<condition>
-						<not>
-							<property>controls/OH/protectors/emergentest</property>
-						</not>
-					</condition>
-					<command>nasal</command>
-					<script>setprop("sim/sounde/oh-cover", 1);</script>
-				</binding>
-			</mod-up>
-		</action>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>EmerGenTestGuard</object-name>
-		<action>
-			<button>0</button>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/OH/protectors/emergentest</property>
-			</binding>
-			<binding>
-				<condition>
-					<not>
-						<property>controls/OH/protectors/emergentest</property>
-					</not>
-				</condition>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-cover", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>rotate</type>
-		<object-name>EmerGenTestGuard</object-name>
-		<property>controls/OH/protectors/emergentest</property>
-		<factor>-145</factor>
-		<axis>
-			<x1-m>0.008142</x1-m>
-			<y1-m>-0.298068</y1-m>
-			<z1-m>-0.028926</z1-m>
-			<x2-m>0.006752</x2-m>
-			<y2-m>-0.286753</y2-m>
-			<z2-m>-0.028926</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<name>Gen 1 Line Contactor pick</name>
-		<type>pick</type>
-		<object-name>Gen1LineBtn</object-name>
-		<object-name>Gen1LineBtn1S</object-name>
-		<object-name>Gen1LineBtn2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/electrical/switches/gen-1-line-contactor</property>
-				<value>0</value>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>Gen1LineBtn2O</object-name>
-		<condition>
-			<and>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-ess</property>
-					<value>25</value>
-				</greater-than-equals>
-				<or>
-					<equals>
-						<property>controls/electrical/switches/gen-1-line-contactor</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</and>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>EmerGenInd1F</object-name>
-		<condition>
-			<and>
-				<or>
-					<property>systems/electrical/light/rat-emer-gen-fault</property>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</and>
-		</condition>
-	</animation>
-
-	<animation>
-		<name>ELEC RAT MAN pick</name>
-		<type>pick</type>
-		<object-name>EmerElecManOnBtn</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<and>
-						<equals>
-							<property>controls/OH/protectors/elecratman</property>
-							<value>1</value>
-						</equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-hot-1</property>
-							<value>25</value>
-						</greater-than-equals>
-					</and>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/electrical/switches/emer-elec-man-on</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/OH/protectors/elecratman</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<mod-up>
-				<binding>
-					<condition>
-						<and>
-							<equals>
-								<property>controls/OH/protectors/elecratman</property>
-								<value>1</value>
-							</equals>
-						</and>
-					</condition>
-					<command>property-assign</command>
-					<property>controls/electrical/switches/emer-elec-man-on</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<condition>
-						<and>
-							<equals>
-								<property>controls/OH/protectors/elecratman</property>
-								<value>1</value>
-							</equals>
-						</and>
-					</condition>
-					<command>property-assign</command>
-					<property>controls/OH/protectors/elecratman</property>
-					<value>0</value>
-				</binding>
-			</mod-up>
-		</action>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>EmerManOnGuard</object-name>
-		<action>
-			<button>0</button>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/OH/protectors/elecratman</property>
-			</binding>
-			<binding>
-				<condition>
-					<not>
-						<property>controls/OH/protectors/elecratman</property>
-					</not>
-				</condition>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-cover", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>rotate</type>
-		<object-name>EmerManOnGuard</object-name>
-		<property>controls/OH/protectors/elecratman</property>
-		<factor>-145</factor>
-		<axis>
-			<x1-m>-0.00273</x1-m>
-			<y1-m>-0.20848</y1-m>
-			<z1-m>-0.02796</z1-m>
-			<x2-m>-0.00420</x2-m>
-			<y2-m>-0.19657</y2-m>
-			<z2-m>-0.02796</z2-m>
-		</axis>
-	</animation>
-
 	<!-- Pneumatic -->
 	<animation>
 		<name>AC pack flow pick</name>
diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml
index b55a18a6..5a36a0a8 100644
--- a/Systems/a320-cockpit.xml
+++ b/Systems/a320-cockpit.xml
@@ -434,6 +434,16 @@
 			<input>/controls/OH/protectors/emercall</input>
 			<c1>20</c1>
 		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/emergentest-pos">
+			<input>/controls/OH/protectors/emergentest</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/elecratman-pos">
+			<input>/controls/OH/protectors/elecratman</input>
+			<c1>20</c1>
+		</lag_filter>
 	
 	</channel>