diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index f341bc96..634a3add 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -15917,6 +15917,312 @@
 			<z2-m>0.914005</z2-m>
 		</axis>
 	</animation>
+
+	<!-- Hydraulic -->
+	<animation>
+		<name>Green Eng Pump pick</name>
+		<type>pick</type>
+		<object-name>GreenEngPump</object-name>
+		<object-name>GreenEngPump1F</object-name>
+		<object-name>GreenEngPump2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>controls/hydraulic/switches/green-edp</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>green-eng-lbl</tooltip-id>
+				<label>Green engine pump pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GreenEngPump1F</object-name>
+		<condition>
+			<or>
+				<property>systems/hydraulic/lights/green-edp-fault</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GreenEngPump2O</object-name>
+		<condition>
+			<or>
+				<not><property>controls/hydraulic/switches/green-edp</property></not>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<name>RAT MAN pick</name>
+		<type>pick</type>
+		<object-name>RATMan</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-assign</command>
+				<property>controls/hydraulic/switches/rat-man</property>
+				<value>1</value>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>controls/hydraulic/switches/rat-man</property>
+					<value>0</value>
+				</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rat-lbl</tooltip-id>
+				<label>Deploy Ram Air Turbine</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>knob</type>
+		<object-name>RATManGuard</object-name>
+		<property>controls/OH/protectors/ratman</property>
+		<factor>145</factor>
+		<axis>
+			<object-name>RATManGuard.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/OH/protectors/ratman</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>ratguard-lbl</tooltip-id>
+				<label>RAT guard</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<name>Blue Elec Pump pick</name>
+		<type>pick</type>
+		<object-name>BlueElecPump</object-name>
+		<object-name>BlueElecPump1F</object-name>
+		<object-name>BlueElecPump2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>controls/hydraulic/switches/blue-elec</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>blue-elec-lbl</tooltip-id>
+				<label>Blue electrical pump pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>BlueElecPump1F</object-name>
+		<condition>
+			<or>
+				<property>systems/hydraulic/lights/blue-elec-fault</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>BlueElecPump2O</object-name>
+		<condition>
+			<or>
+				<not><property>controls/hydraulic/switches/blue-elec</property></not>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<name>PTU pick</name>
+		<type>pick</type>
+		<object-name>PTU</object-name>
+		<object-name>PTU1F</object-name>
+		<object-name>PTU2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>controls/hydraulic/switches/ptu</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>PTU-lbl</tooltip-id>
+				<label>Power transfer unit pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>PTU1F</object-name>
+		<condition>
+			<or>
+				<property>systems/hydraulic/lights/ptu-fault</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>PTU2O</object-name>
+		<condition>
+			<or>
+				<not><property>controls/hydraulic/switches/ptu</property></not>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>YellowEngPump</object-name>
+		<object-name>YellowEngPump1F</object-name>
+		<object-name>YellowEngPump2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>controls/hydraulic/switches/yellow-edp</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>yellow-eng-lbl</tooltip-id>
+				<label>Yellow engine pump pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>YellowEngPump1F</object-name>
+		<condition>
+			<or>
+				<property>systems/hydraulic/lights/yellow-edp-fault</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>YellowEngPump2O</object-name>
+		<condition>
+			<or>
+				<not><property>controls/hydraulic/switches/yellow-edp</property></not>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>YellowElecPump</object-name>
+		<object-name>YellowElecPump1F</object-name>
+		<object-name>YellowElecPump2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>controls/hydraulic/switches/yellow-elec</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>yellow-elec-lbl</tooltip-id>
+				<label>Yellow electrical pump pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>YellowElecPump1F</object-name>
+		<condition>
+			<or>
+				<property>systems/hydraulic/lights/yellow-elec-fault</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>YellowElecPump2O</object-name>
+		<condition>
+			<or>
+				<property>controls/hydraulic/switches/yellow-elec</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
 	
 	<!-- FCTL -->
 
@@ -16521,6 +16827,419 @@
 			</or>
 		</condition>
 	</animation>
+	
+	<!-- GPWS -->
+	<animation>
+		<type>pick</type>
+		<object-name>GPWSTerrBtn</object-name>
+		<object-name>GPWSTerrBtn1F</object-name>
+		<object-name>GPWSTerrBtn2O</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>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
+			</binding>
+			<binding>
+				<condition>
+					<equals>					
+						<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
+						<value>1</value>
+					</equals>
+				</condition>
+				<command>property-assign</command>
+				<property>instrumentation/efis/inputs/terr</property>
+				<value>0</value>
+			</binding>
+			<binding>
+				<condition>
+					<equals>					
+						<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
+						<value>1</value>
+					</equals>
+				</condition>
+				<command>property-assign</command>
+				<property>instrumentation/efis[1]/inputs/terr</property>
+				<value>0</value>
+			</binding>
+			<binding>
+				<command>property-assign</command>
+				<property>/controls/cockpit/gpws-terr-translate</property>
+				<value>0.00075</value>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>/controls/cockpit/gpws-terr-translate</property>
+					<value>0.0</value>
+				</binding>
+			</mod-up>
+			<binding>
+				<condition>
+					<equals>					
+						<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
+						<value>0</value>
+					</equals>
+				</condition>
+				<command>nasal</command>
+				<script>
+					setprop("instrumentation/efis/inputs/terr",getprop("controls/switches/terr_on_nd_l"));
+					setprop("instrumentation/efis[1]/inputs/terr",getprop("controls/switches/terr_on_nd_r"));
+				</script>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gpws-terr-lbl</tooltip-id>
+				<label>GPWS terrain pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>translate</type>
+		<object-name>GPWSTerrBtn</object-name>
+		<object-name>GPWSTerrBtn1F</object-name>
+		<object-name>GPWSTerrBtn2O</object-name>
+		<property>/controls/cockpit/gpws-terr-translate</property>
+		<axis>
+			<x1-m>-0.13646</x1-m>
+			<y1-m>0.000025</y1-m>
+			<z1-m>0.904695</z1-m>
+			<x2-m>-0.14011</x2-m>
+			<y2-m>0.000025</y2-m>
+			<z2-m>0.914005</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>GPWSBtn</object-name>
+		<object-name>GPWSBtn1F</object-name>
+		<object-name>GPWSBtn2O</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>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+			<binding>
+				<command>property-assign</command>
+				<property>/controls/cockpit/gpws-sys-translate</property>
+				<value>0.00075</value>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>/controls/cockpit/gpws-sys-translate</property>
+					<value>0.0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gpws-sys-lbl</tooltip-id>
+				<label>GPWS system pushbutton</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>translate</type>
+		<object-name>GPWSBtn</object-name>
+		<object-name>GPWSBtn1F</object-name>
+		<object-name>GPWSBtn2O</object-name>
+		<property>/controls/cockpit/gpws-sys-translate</property>
+		<axis>
+			<x1-m>-0.13646</x1-m>
+			<y1-m>0.000025</y1-m>
+			<z1-m>0.904695</z1-m>
+			<x2-m>-0.14011</x2-m>
+			<y2-m>0.000025</y2-m>
+			<z2-m>0.914005</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>GPWSGSBtn</object-name>
+		<object-name>GPWSGSBtn2O</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>instrumentation/mk-viii/inputs/discretes/glideslope-inhibit</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+			<binding>
+				<command>property-assign</command>
+				<property>/controls/cockpit/gpws-gs-translate</property>
+				<value>0.00075</value>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>/controls/cockpit/gpws-gs-translate</property>
+					<value>0.0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gpws-gs-lbl</tooltip-id>
+				<label>GPWS inhibit glideslope warning</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>translate</type>
+		<object-name>GPWSGSBtn</object-name>
+		<object-name>GPWSGSBtn2O</object-name>
+		<property>/controls/cockpit/gpws-gs-translate</property>
+		<axis>
+			<x1-m>-0.13646</x1-m>
+			<y1-m>0.000025</y1-m>
+			<z1-m>0.904695</z1-m>
+			<x2-m>-0.14011</x2-m>
+			<y2-m>0.000025</y2-m>
+			<z2-m>0.914005</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>GPWSFlpBtn</object-name>
+		<object-name>GPWSFlpBtn2O</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>instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+			<binding>
+				<command>property-assign</command>
+				<property>/controls/cockpit/gpws-flap-translate</property>
+				<value>0.00075</value>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>/controls/cockpit/gpws-flap-translate</property>
+					<value>0.0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gpws-flap-lbl</tooltip-id>
+				<label>GPWS inhibit flaps warning</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>translate</type>
+		<object-name>GPWSFlpBtn</object-name>
+		<object-name>GPWSFlpBtn2O</object-name>
+		<property>/controls/cockpit/gpws-flap-translate</property>
+		<axis>
+			<x1-m>-0.13646</x1-m>
+			<y1-m>0.000025</y1-m>
+			<z1-m>0.904695</z1-m>
+			<x2-m>-0.14011</x2-m>
+			<y2-m>0.000025</y2-m>
+			<z2-m>0.914005</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>GPWSFlp3Btn</object-name>
+		<object-name>GPWSFlp3Btn2O</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>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.pushbutton();</script>
+			</binding>
+			<binding>
+				<command>property-assign</command>
+				<property>/controls/cockpit/gpws-flap3-translate</property>
+				<value>0.00075</value>
+			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>/controls/cockpit/gpws-flap3-translate</property>
+					<value>0.0</value>
+				</binding>
+			</mod-up>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>flaps3-lbl</tooltip-id>
+				<label>GPWS land with flaps 3</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>translate</type>
+		<object-name>GPWSFlp3Btn</object-name>
+		<object-name>GPWSFlp3Btn2O</object-name>
+		<property>/controls/cockpit/gpws-flap3-translate</property>
+		<axis>
+			<x1-m>-0.13646</x1-m>
+			<y1-m>0.000025</y1-m>
+			<z1-m>0.904695</z1-m>
+			<x2-m>-0.14011</x2-m>
+			<y2-m>0.000025</y2-m>
+			<z2-m>0.914005</z2-m>
+		</axis>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSTerrBtn1F</object-name>
+		<condition>
+			<or>
+				<and>
+					<not><property>instrumentation/mk-viii/serviceable</property></not>
+					<not><property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property></not>
+				</and>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSTerrBtn2O</object-name>
+		<condition>
+			<or>
+				<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSBtn1F</object-name>
+		<condition>
+			<or>
+				<and>
+					<not><property>instrumentation/mk-viii/serviceable</property></not>
+					<not><property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property></not>
+				</and>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSBtn2O</object-name>
+		<condition>
+			<or>
+				<property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSGSBtn2O</object-name>
+		<condition>
+			<or>
+				<property>instrumentation/mk-viii/inputs/discretes/glideslope-inhibit</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSFlpBtn2O</object-name>
+		<condition>
+			<or>
+				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>GPWSFlp3Btn2O</object-name>
+		<condition>
+			<or>
+				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
 
 	<!-- Cargo Smoke -->
 	<animation>
@@ -16574,7 +17293,7 @@
 			<binding>
 				<command>property-assign</command>
 				<property>/controls/cockpit/fwd-cargo-disch-btn-translate</property>
-				<value>-0.00075</value>
+				<value>0.00075</value>
 			</binding>
 			<mod-up>
 				<binding>
@@ -16635,7 +17354,7 @@
 			</binding><binding>
 				<command>property-assign</command>
 				<property>/controls/cockpit/cargo-fire-test-translate</property>
-				<value>-0.00075</value>
+				<value>0.00075</value>
 			</binding>
 			<mod-up>
 				<binding>
@@ -16692,7 +17411,7 @@
 			<binding>
 				<command>property-assign</command>
 				<property>/controls/cockpit/aft-cargo-disch-btn-translate</property>
-				<value>-0.00075</value>
+				<value>0.00075</value>
 			</binding>
 			<mod-up>
 				<binding>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index c451ffd2..87f2989b 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -9,746 +9,8 @@
 	<!-- ANIMATIONS -->
 
 
-	<!-- GPWS -->
-	<animation>
-		<type>pick</type>
-		<object-name>GPWSTerrBtn</object-name>
-		<object-name>GPWSTerrBtn1F</object-name>
-		<object-name>GPWSTerrBtn2O</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>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
-			</binding>
-			<binding>
-				<condition>
-					<equals>					
-						<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>property-assign</command>
-				<property>instrumentation/efis/inputs/terr</property>
-				<value>0</value>
-			</binding>
-			<binding>
-				<condition>
-					<equals>					
-						<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>property-assign</command>
-				<property>instrumentation/efis[1]/inputs/terr</property>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/cockpit/gpws-terr-translate</property>
-				<value>0.00075</value>
-			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/cockpit/gpws-terr-translate</property>
-					<value>0.0</value>
-				</binding>
-			</mod-up>
-			<binding>
-				<condition>
-					<equals>					
-						<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
-						<value>0</value>
-					</equals>
-				</condition>
-				<command>nasal</command>
-				<script>
-					setprop("instrumentation/efis/inputs/terr",getprop("controls/switches/terr_on_nd_l"));
-					setprop("instrumentation/efis[1]/inputs/terr",getprop("controls/switches/terr_on_nd_r"));
-				</script>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-		<hovered>
-			<binding>
-				<command>set-tooltip</command>
-				<tooltip-id>gpws-terr-lbl</tooltip-id>
-				<label>GPWS terrain pushbutton</label>
-			</binding>
-		</hovered>
-	</animation>
-	
-	<animation>
-		<type>translate</type>
-		<object-name>GPWSTerrBtn</object-name>
-		<object-name>GPWSTerrBtn1F</object-name>
-		<object-name>GPWSTerrBtn2O</object-name>
-		<property>/controls/cockpit/gpws-terr-translate</property>
-		<axis>
-			<x1-m>-0.13646</x1-m>
-			<y1-m>0.000025</y1-m>
-			<z1-m>0.904695</z1-m>
-			<x2-m>-0.14011</x2-m>
-			<y2-m>0.000025</y2-m>
-			<z2-m>0.914005</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>GPWSBtn</object-name>
-		<object-name>GPWSBtn1F</object-name>
-		<object-name>GPWSBtn2O</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>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/cockpit/gpws-sys-translate</property>
-				<value>0.00075</value>
-			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/cockpit/gpws-sys-translate</property>
-					<value>0.0</value>
-				</binding>
-			</mod-up>
-		</action>
-		<hovered>
-			<binding>
-				<command>set-tooltip</command>
-				<tooltip-id>gpws-sys-lbl</tooltip-id>
-				<label>GPWS system pushbutton</label>
-			</binding>
-		</hovered>
-	</animation>
-
-	<animation>
-		<type>translate</type>
-		<object-name>GPWSBtn</object-name>
-		<object-name>GPWSBtn1F</object-name>
-		<object-name>GPWSBtn2O</object-name>
-		<property>/controls/cockpit/gpws-sys-translate</property>
-		<axis>
-			<x1-m>-0.13646</x1-m>
-			<y1-m>0.000025</y1-m>
-			<z1-m>0.904695</z1-m>
-			<x2-m>-0.14011</x2-m>
-			<y2-m>0.000025</y2-m>
-			<z2-m>0.914005</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>GPWSGSBtn</object-name>
-		<object-name>GPWSGSBtn2O</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>instrumentation/mk-viii/inputs/discretes/glideslope-inhibit</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/cockpit/gpws-gs-translate</property>
-				<value>0.00075</value>
-			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/cockpit/gpws-gs-translate</property>
-					<value>0.0</value>
-				</binding>
-			</mod-up>
-		</action>
-		<hovered>
-			<binding>
-				<command>set-tooltip</command>
-				<tooltip-id>gpws-gs-lbl</tooltip-id>
-				<label>GPWS inhibit glideslope warning</label>
-			</binding>
-		</hovered>
-	</animation>
-
-	<animation>
-		<type>translate</type>
-		<object-name>GPWSGSBtn</object-name>
-		<object-name>GPWSGSBtn2O</object-name>
-		<property>/controls/cockpit/gpws-gs-translate</property>
-		<axis>
-			<x1-m>-0.13646</x1-m>
-			<y1-m>0.000025</y1-m>
-			<z1-m>0.904695</z1-m>
-			<x2-m>-0.14011</x2-m>
-			<y2-m>0.000025</y2-m>
-			<z2-m>0.914005</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>GPWSFlpBtn</object-name>
-		<object-name>GPWSFlpBtn2O</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>instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/cockpit/gpws-flap-translate</property>
-				<value>0.00075</value>
-			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/cockpit/gpws-flap-translate</property>
-					<value>0.0</value>
-				</binding>
-			</mod-up>
-		</action>
-		<hovered>
-			<binding>
-				<command>set-tooltip</command>
-				<tooltip-id>gpws-flap-lbl</tooltip-id>
-				<label>GPWS inhibit flaps warning</label>
-			</binding>
-		</hovered>
-	</animation>
-
-	<animation>
-		<type>translate</type>
-		<object-name>GPWSFlpBtn</object-name>
-		<object-name>GPWSFlpBtn2O</object-name>
-		<property>/controls/cockpit/gpws-flap-translate</property>
-		<axis>
-			<x1-m>-0.13646</x1-m>
-			<y1-m>0.000025</y1-m>
-			<z1-m>0.904695</z1-m>
-			<x2-m>-0.14011</x2-m>
-			<y2-m>0.000025</y2-m>
-			<z2-m>0.914005</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>GPWSFlp3Btn</object-name>
-		<object-name>GPWSFlp3Btn2O</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>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/cockpit/gpws-flap3-translate</property>
-				<value>0.00075</value>
-			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/cockpit/gpws-flap3-translate</property>
-					<value>0.0</value>
-				</binding>
-			</mod-up>
-		</action>
-		<hovered>
-			<binding>
-				<command>set-tooltip</command>
-				<tooltip-id>flaps3-lbl</tooltip-id>
-				<label>GPWS land with flaps 3</label>
-			</binding>
-		</hovered>
-	</animation>
-
-	<animation>
-		<type>translate</type>
-		<object-name>GPWSFlp3Btn</object-name>
-		<object-name>GPWSFlp3Btn2O</object-name>
-		<property>/controls/cockpit/gpws-flap3-translate</property>
-		<axis>
-			<x1-m>-0.13646</x1-m>
-			<y1-m>0.000025</y1-m>
-			<z1-m>0.904695</z1-m>
-			<x2-m>-0.14011</x2-m>
-			<y2-m>0.000025</y2-m>
-			<z2-m>0.914005</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSTerrBtn1F</object-name>
-		<condition>
-			<or>
-				<and>
-					<not><property>instrumentation/mk-viii/serviceable</property></not>
-					<not><property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property></not>
-				</and>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSTerrBtn2O</object-name>
-		<condition>
-			<or>
-				<property>instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSBtn1F</object-name>
-		<condition>
-			<or>
-				<and>
-					<not><property>instrumentation/mk-viii/serviceable</property></not>
-					<not><property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property></not>
-				</and>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSBtn2O</object-name>
-		<condition>
-			<or>
-				<property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSGSBtn2O</object-name>
-		<condition>
-			<or>
-				<property>instrumentation/mk-viii/inputs/discretes/glideslope-inhibit</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSFlpBtn2O</object-name>
-		<condition>
-			<or>
-				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GPWSFlp3Btn2O</object-name>
-		<condition>
-			<or>
-				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<!-- Hydraulic -->
-	<animation>
-		<name>Green Eng Pump pick</name>
-		<type>pick</type>
-		<object-name>GreenEngPump1</object-name>
-		<object-name>GreenEngPump2</object-name>
-		<object-name>GreenEngPump1F</object-name>
-		<object-name>GreenEngPump2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/hydraulic/switches/green-edp</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GreenEngPump1F</object-name>
-		<condition>
-			<or>
-				<property>systems/hydraulic/lights/green-edp-fault</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>GreenEngPump2O</object-name>
-		<condition>
-			<or>
-				<not>
-					<property>controls/hydraulic/switches/green-edp</property>
-				</not>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<name>RAT MAN pick</name>
-		<type>pick</type>
-		<object-name>RATMan</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<and>
-						<equals>
-							<property>controls/OH/protectors/ratman</property>
-							<value>1</value>
-						</equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-hot-2</property>
-							<value>25</value>
-						</greater-than-equals>
-					</and>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/hydraulic/switches/rat-man</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/OH/protectors/ratman</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-			<mod-up>
-				<binding>
-					<condition>
-						<and>
-							<equals>
-								<property>controls/OH/protectors/ratman</property>
-								<value>1</value>
-							</equals>
-						</and>
-					</condition>
-					<command>property-assign</command>
-					<property>controls/hydraulic/switches/rat-man</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<condition>
-						<and>
-							<equals>
-								<property>controls/OH/protectors/ratman</property>
-								<value>1</value>
-							</equals>
-						</and>
-					</condition>
-					<command>property-assign</command>
-					<property>controls/OH/protectors/ratman</property>
-					<value>0</value>
-				</binding>
-			</mod-up>
-		</action>
-	</animation>
-
-	<animation>
-		<type>pick</type>
-		<object-name>RATManGuard</object-name>
-		<action>
-			<button>0</button>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/OH/protectors/ratman</property>
-			</binding>
-			<binding>
-				<condition>
-					<not>
-						<property>controls/OH/protectors/ratman</property>
-					</not>
-				</condition>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-cover", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>rotate</type>
-		<object-name>RATManGuard</object-name>
-		<property>controls/OH/protectors/ratman</property>
-		<factor>-145</factor>
-		<axis>
-			<x1-m>-0.0086</x1-m>
-			<y1-m>-0.05506</y1-m>
-			<z1-m>0.14462</z1-m>
-			<x2-m>-0.0086</x2-m>
-			<y2-m>-0.04306</y2-m>
-			<z2-m>0.14462</z2-m>
-		</axis>
-	</animation>
-
-	<animation>
-		<name>Blue Elec Pump pick</name>
-		<type>pick</type>
-		<object-name>BlueElecPump1</object-name>
-		<object-name>BlueElecPump2</object-name>
-		<object-name>BlueElecPump1F</object-name>
-		<object-name>BlueElecPump2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/hydraulic/switches/blue-elec</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>BlueElecPump1F</object-name>
-		<condition>
-			<or>
-				<property>systems/hydraulic/lights/blue-elec-fault</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>BlueElecPump2O</object-name>
-		<condition>
-			<or>
-				<not>
-					<property>controls/hydraulic/switches/blue-elec</property>
-				</not>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<name>PTU pick</name>
-		<type>pick</type>
-		<object-name>PTU1</object-name>
-		<object-name>PTU2</object-name>
-		<object-name>PTU1F</object-name>
-		<object-name>PTU2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/hydraulic/switches/ptu</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>PTU1F</object-name>
-		<condition>
-			<or>
-				<property>systems/hydraulic/lights/ptu-fault</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>PTU2O</object-name>
-		<condition>
-			<or>
-				<not>
-					<property>controls/hydraulic/switches/ptu</property>
-				</not>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<name>Yellow Eng Pump pick</name>
-		<type>pick</type>
-		<object-name>YellowEngPump1</object-name>
-		<object-name>YellowEngPump2</object-name>
-		<object-name>YellowEngPump1F</object-name>
-		<object-name>YellowEngPump2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/hydraulic/switches/yellow-edp</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>YellowEngPump1F</object-name>
-		<condition>
-			<or>
-				<property>systems/hydraulic/lights/yellow-edp-fault</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>YellowEngPump2O</object-name>
-		<condition>
-			<or>
-				<not>
-					<property>controls/hydraulic/switches/yellow-edp</property>
-				</not>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<name>Yellow Eng Pump pick</name>
-		<type>pick</type>
-		<object-name>YellowElecPump1</object-name>
-		<object-name>YellowElecPump2</object-name>
-		<object-name>YellowElecPump1F</object-name>
-		<object-name>YellowElecPump2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/hydraulic/switches/yellow-elec</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>YellowElecPump1F</object-name>
-		<condition>
-			<or>
-				<property>systems/hydraulic/lights/yellow-elec-fault</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>YellowElecPump2O</object-name>
-		<condition>
-			<or>
-				<property>controls/hydraulic/switches/yellow-elec</property>
-				<property>controls/switches/annun-test</property>
-			</or>
-		</condition>
-	</animation>
 
 	<!-- Fuel -->
-
 	<animation>
 		<type>pick</type>
 		<object-name>FuelXfeedBtn1</object-name>