diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 0097d780..8a0e4e68 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -130,6 +130,7 @@ var colddark = func {
 	libraries.flaptimer.stop();
 	setprop("/controls/flight/speedbrake-arm", 0);
 	setprop("/controls/gear/gear-down", 1);
+	setprop("/controls/flight/elevator-trim", 0);
 	systemsReset();
 	failReset();
 	if (getprop("/engines/engine[1]/n2") < 2) {
@@ -174,6 +175,7 @@ var beforestart = func {
 	libraries.flaptimer.stop();
 	setprop("/controls/flight/speedbrake-arm", 0);
 	setprop("/controls/gear/gear-down", 1);
+	setprop("/controls/flight/elevator-trim", 0);
 	systemsReset();
 	failReset();
 	setprop("/controls/APU/master", 0);
@@ -249,6 +251,7 @@ var taxi = func {
 	libraries.flaptimer.stop();
 	setprop("/controls/flight/speedbrake-arm", 0);
 	setprop("/controls/gear/gear-down", 1);
+	setprop("/controls/flight/elevator-trim", 0);
 	systemsReset();
 	failReset();
 	setprop("/controls/APU/master", 0);
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index ba315382..d9481283 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -2167,7 +2167,7 @@
 		<type>rotate</type>
 		<object-name>trim_wheel</object-name>
 		<property>/controls/flight/elevator-trim</property>
-		<factor>-700</factor>
+		<factor>-100</factor>
 		<center>
 			<x-m>-0.2373</x-m>
 			<y-m>0</y-m>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 0bc20fb7..6b18a0c6 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -25,11 +25,14 @@
 		<object-name>BatteryBtn12O</object-name>
 		<object-name>BatteryBtn21F</object-name>
 		<object-name>BatteryBtn22O</object-name>
+		<object-name>BusTieBtn2O</object-name>
+		<object-name>DitchBtn2O</object-name>
 		<object-name>ExtPwrBtn2O</object-name>
 		<object-name>Gen1Btn1F</object-name>
 		<object-name>Gen1Btn2O</object-name>
 		<object-name>Gen2Btn1F</object-name>
 		<object-name>Gen2Btn2O</object-name>
+		<object-name>RamAirBtn2O</object-name>
 		<condition>
 			<or>
 				<greater-than-equals>
@@ -64,7 +67,6 @@
 		<object-name>ADR3Btn2O</object-name>
 		<object-name>BlueElecPump1F</object-name>
 		<object-name>BlueElecPump2O</object-name>
-		<object-name>BusTieBtn2O</object-name>
 		<object-name>CFuelTank1Btn1F</object-name>
 		<object-name>CFuelTank1Btn2O</object-name>
 		<object-name>CFuelTank2Btn1F</object-name>
@@ -149,7 +151,6 @@
 	</animation>
 	
 	<!-- IRS 1 -->
-	
 	<animation>
 		<type>pick</type>
 		<object-name>IR1ModeKnb</object-name>
@@ -242,7 +243,6 @@
 	</animation>
 	
 	<!-- IRS 2 -->
-	
 	<animation>
 		<type>pick</type>
 		<object-name>IR2ModeKnb</object-name>
@@ -335,7 +335,6 @@
 	</animation>
 
 	<!-- IRS 3 -->
-	
 	<animation>
 		<type>pick</type>
 		<object-name>IR3ModeKnb</object-name>
@@ -428,7 +427,6 @@
 	</animation>
 	
 	<!-- IR Display Data Knob -->
-	
 	<animation>
 		<type>pick</type>
 		<object-name>IRDisplayDataKnb</object-name>
@@ -497,7 +495,6 @@
 	</animation>
 	
 	<!-- IRS Display Select Knob -->
-	
 	<animation>
 		<type>pick</type>
 		<object-name>IRDisplaySelectKnb</object-name>
@@ -589,6 +586,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/adirs/adr[0]/off</property>
 			</binding>
@@ -644,6 +653,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/adirs/adr[1]/off</property>
 			</binding>
@@ -699,6 +720,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/adirs/adr[2]/off</property>
 			</binding>
@@ -994,6 +1027,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/hydraulic/eng1-pump</property>
 			</binding>
@@ -1046,6 +1091,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/hydraulic/rat-man</property>
 			</binding>
@@ -1067,6 +1132,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/hydraulic/elec-pump-blue</property>
 			</binding>
@@ -1122,6 +1199,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/hydraulic/ptu</property>
 			</binding>
@@ -1177,6 +1266,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/hydraulic/eng2-pump</property>
 			</binding>
@@ -1232,6 +1333,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/hydraulic/elec-pump-yellow</property>
 			</binding>
@@ -1287,6 +1400,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/x-feed</property>
 			</binding>
@@ -1341,6 +1466,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/tank2pump1</property>
 			</binding>
@@ -1394,6 +1531,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/tank2pump2</property>
 			</binding>
@@ -1447,6 +1596,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/tank3pump1</property>
 			</binding>
@@ -1499,6 +1660,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/mode</property>
 			</binding>
@@ -1552,6 +1725,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/tank3pump2</property>
 			</binding>
@@ -1605,6 +1790,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/tank4pump1</property>
 			</binding>
@@ -1658,6 +1855,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/fuel/tank4pump2</property>
 			</binding>
@@ -1712,6 +1921,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/galley</property>
 			</binding>
@@ -1876,6 +2097,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/systems/unused/unused-oh</property>
 			</binding>
@@ -1910,6 +2143,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen1</property>
 			</binding>
@@ -1974,6 +2227,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/ac-ess-feed</property>
 			</binding>
@@ -2029,6 +2294,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen-apu</property>
 			</binding>
@@ -2080,6 +2365,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/apu-ext-crosstie</property>
 			</binding>
@@ -2177,6 +2482,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/electrical/switches/gen2</property>
 			</binding>
@@ -2241,6 +2566,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/systems/unused/unused-oh</property>
 			</binding>
@@ -2335,6 +2672,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/pack1</property>
 			</binding>
@@ -2400,6 +2757,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/bleed1</property>
 			</binding>
@@ -2455,6 +2824,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/bleedapu</property>
 			</binding>
@@ -2510,6 +2899,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/bleed2</property>
 			</binding>
@@ -2564,6 +2965,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/hot-air</property>
 			</binding>
@@ -2619,6 +3032,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/pack2</property>
 			</binding>
@@ -2681,14 +3114,29 @@
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
-			<!--binding>
+			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/pneumatic/switches/ram-air</property>
-			</binding-->
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/pneumatic/switches/ram-air</property>
-				<value>0</value>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -2713,6 +3161,127 @@
 			</or>
 		</condition>
 	</animation>
+	
+	<!-- Cabin Pressurization -->
+	<animation>
+		<type>pick</type>
+		<object-name>CabinPressModeBtn</object-name>
+		<object-name>CabinPressModeBtn1F</object-name>
+		<object-name>CabinPressModeBtn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<!--binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
+				<command>property-toggle</command>
+				<property>/controls/pressurization/auto</property>
+			</binding-->
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/btn1", 1);</script>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>CabinPressModeBtn1F</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/systems/failures/pack2</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>CabinPressModeBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/pressurization/auto</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>DitchBtn</object-name>
+		<object-name>DitchBtn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<!--binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
+				<command>property-toggle</command>
+				<property>/controls/ditching</property>
+			</binding-->
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/btn1", 1);</script>
+			</binding>
+		</action>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>DitchBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/pressurization/unused-oh-btn</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
 
 	<!-- Exterior lights -->
 	<animation>
@@ -3005,6 +3574,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
 				<property>/controls/APU/master</property>
 			</binding>
@@ -3060,6 +3649,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>nasal</command>
 				<script>
 				if (getprop("/controls/APU/master") == 1) {
diff --git a/Models/Instruments/OHpanel/res/background.png b/Models/Instruments/OHpanel/res/background.png
index 03f49d46..1ab4b257 100644
Binary files a/Models/Instruments/OHpanel/res/background.png and b/Models/Instruments/OHpanel/res/background.png differ
diff --git a/Models/Instruments/OHpanel/res/markings.png b/Models/Instruments/OHpanel/res/markings.png
index 4801dd44..965e973e 100644
Binary files a/Models/Instruments/OHpanel/res/markings.png and b/Models/Instruments/OHpanel/res/markings.png differ
diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac
index 8c4fda18..7c794aba 100644
--- a/Models/Instruments/OHpanel/res/ohpanel.ac
+++ b/Models/Instruments/OHpanel/res/ohpanel.ac
@@ -8,7 +8,531 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8  amb 1 1 1  emis 1 1 1  spec 0.5 0.5 0.5
 MATERIAL "Switch" rgb 0.678431 0.678431 0.678431  amb 0.678431 0.678431 0.678431  emis 0 0 0  spec 0 0 0  shi 32  trans 0.004
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 0 0 0  spec 1 1 1  shi 128  trans 0
 OBJECT world
-kids 261
+kids 265
+OBJECT poly
+name "DitchBtn2O"
+loc 0.000175806 -0.17005 -0.10065
+data 8
+Cube.063
+texture "buttons3.png"
+crease 30.000000
+numvert 8
+-0.007 -0.0564 -0.0528
+-0.007 -0.0564 -0.0328
+-0.01 -0.0564 -0.0328
+-0.01 -0.0564 -0.0528
+-0.007 -0.0464 -0.0528
+-0.007 -0.0464 -0.0328
+-0.01 -0.0464 -0.0328
+-0.01 -0.0464 -0.0528
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.5
+1 0 0.5
+2 0 0.5
+3 0.5 0.5
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.5
+4 0.5 0.75
+5 9.31321e-008 0.75
+1 0 0.5
+SURF 0x0
+mat 4
+refs 4
+1 0 0.5
+5 9.31321e-008 0.75
+6 9.31321e-008 0.75
+2 0 0.5
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.75
+0 0.5 0.5
+3 0.5 0.5
+7 0.5 0.75
+kids 0
+OBJECT poly
+name "ManVSCTLSwitch"
+loc 0.000114223 0.085027 -0.0041284
+data 12
+Cylinder.034
+crease 30.000000
+numvert 49
+-0.01 -0.304591 -0.038891
+-0.01 -0.30496 -0.038
+-0.01 -0.304591 -0.037109
+-0.01 -0.3037 -0.03674
+-0.01 -0.302809 -0.037109
+-0.01 -0.30244 -0.038
+-0.01 -0.302809 -0.038891
+-0.01 -0.3037 -0.03926
+0.0086 -0.305036 -0.039336
+0.0086 -0.30559 -0.038
+0.0086 -0.305036 -0.036664
+0.0086 -0.3037 -0.03611
+0.0086 -0.302364 -0.036664
+0.0086 -0.30181 -0.038
+0.0086 -0.302364 -0.039336
+0.0086 -0.3037 -0.03989
+-0.013 -0.3037 -0.03926
+-0.013 -0.302809 -0.038891
+-0.013 -0.30244 -0.038
+-0.013 -0.302809 -0.037109
+-0.013 -0.3037 -0.03674
+-0.013 -0.304591 -0.037109
+-0.013 -0.30496 -0.038
+-0.013 -0.304591 -0.038891
+0.0106 -0.3037 -0.03989
+0.0106 -0.302364 -0.039336
+0.0106 -0.30181 -0.038
+0.0106 -0.302364 -0.036664
+0.0106 -0.3037 -0.03611
+0.0106 -0.305036 -0.036664
+0.0106 -0.30559 -0.038
+0.0106 -0.305036 -0.039336
+0.0121 -0.304903 -0.039203
+0.0121 -0.305401 -0.038
+0.0121 -0.304903 -0.036797
+0.0121 -0.3037 -0.036299
+0.0121 -0.302497 -0.036797
+0.0121 -0.301999 -0.038
+0.0121 -0.302497 -0.039203
+0.0121 -0.3037 -0.039701
+0.013229 -0.3037 -0.038851
+0.013229 -0.303099 -0.038601
+0.013229 -0.302849 -0.038
+0.013229 -0.303099 -0.037399
+0.013229 -0.3037 -0.03715
+0.013229 -0.304301 -0.037399
+0.013229 -0.30455 -0.038
+0.013229 -0.304301 -0.038601
+0.013629 -0.3037 -0.038
+numsurf 48
+SURF 0x30
+mat 6
+refs 4
+0 0 0
+8 0 0
+9 0 0
+1 0 0
+SURF 0x30
+mat 6
+refs 4
+1 0 0
+9 0 0
+10 0 0
+2 0 0
+SURF 0x30
+mat 6
+refs 4
+2 0 0
+10 0 0
+11 0 0
+3 0 0
+SURF 0x30
+mat 6
+refs 4
+3 0 0
+11 0 0
+12 0 0
+4 0 0
+SURF 0x30
+mat 6
+refs 4
+4 0 0
+12 0 0
+13 0 0
+5 0 0
+SURF 0x30
+mat 6
+refs 4
+5 0 0
+13 0 0
+14 0 0
+6 0 0
+SURF 0x30
+mat 6
+refs 4
+6 0 0
+14 0 0
+15 0 0
+7 0 0
+SURF 0x30
+mat 6
+refs 4
+8 0 0
+0 0 0
+7 0 0
+15 0 0
+SURF 0x30
+mat 6
+refs 4
+7 0 0
+0 0 0
+23 0 0
+16 0 0
+SURF 0x30
+mat 6
+refs 4
+6 0 0
+7 0 0
+16 0 0
+17 0 0
+SURF 0x30
+mat 6
+refs 4
+5 0 0
+6 0 0
+17 0 0
+18 0 0
+SURF 0x30
+mat 6
+refs 4
+4 0 0
+5 0 0
+18 0 0
+19 0 0
+SURF 0x30
+mat 6
+refs 4
+3 0 0
+4 0 0
+19 0 0
+20 0 0
+SURF 0x30
+mat 6
+refs 4
+2 0 0
+3 0 0
+20 0 0
+21 0 0
+SURF 0x30
+mat 6
+refs 4
+1 0 0
+2 0 0
+21 0 0
+22 0 0
+SURF 0x30
+mat 6
+refs 4
+0 0 0
+1 0 0
+22 0 0
+23 0 0
+SURF 0x30
+mat 6
+refs 4
+8 0 0
+15 0 0
+24 0 0
+31 0 0
+SURF 0x30
+mat 6
+refs 4
+15 0 0
+14 0 0
+25 0 0
+24 0 0
+SURF 0x30
+mat 6
+refs 4
+14 0 0
+13 0 0
+26 0 0
+25 0 0
+SURF 0x30
+mat 6
+refs 4
+13 0 0
+12 0 0
+27 0 0
+26 0 0
+SURF 0x30
+mat 6
+refs 4
+12 0 0
+11 0 0
+28 0 0
+27 0 0
+SURF 0x30
+mat 6
+refs 4
+11 0 0
+10 0 0
+29 0 0
+28 0 0
+SURF 0x30
+mat 6
+refs 4
+10 0 0
+9 0 0
+30 0 0
+29 0 0
+SURF 0x30
+mat 6
+refs 4
+9 0 0
+8 0 0
+31 0 0
+30 0 0
+SURF 0x30
+mat 6
+refs 4
+30 0 0
+31 0 0
+32 0 0
+33 0 0
+SURF 0x30
+mat 6
+refs 4
+29 0 0
+30 0 0
+33 0 0
+34 0 0
+SURF 0x30
+mat 6
+refs 4
+28 0 0
+29 0 0
+34 0 0
+35 0 0
+SURF 0x30
+mat 6
+refs 4
+27 0 0
+28 0 0
+35 0 0
+36 0 0
+SURF 0x30
+mat 6
+refs 4
+26 0 0
+27 0 0
+36 0 0
+37 0 0
+SURF 0x30
+mat 6
+refs 4
+25 0 0
+26 0 0
+37 0 0
+38 0 0
+SURF 0x30
+mat 6
+refs 4
+24 0 0
+25 0 0
+38 0 0
+39 0 0
+SURF 0x30
+mat 6
+refs 4
+31 0 0
+24 0 0
+39 0 0
+32 0 0
+SURF 0x30
+mat 6
+refs 4
+32 0 0
+39 0 0
+40 0 0
+47 0 0
+SURF 0x30
+mat 6
+refs 4
+39 0 0
+38 0 0
+41 0 0
+40 0 0
+SURF 0x30
+mat 6
+refs 4
+38 0 0
+37 0 0
+42 0 0
+41 0 0
+SURF 0x30
+mat 6
+refs 4
+37 0 0
+36 0 0
+43 0 0
+42 0 0
+SURF 0x30
+mat 6
+refs 4
+36 0 0
+35 0 0
+44 0 0
+43 0 0
+SURF 0x30
+mat 6
+refs 4
+35 0 0
+34 0 0
+45 0 0
+44 0 0
+SURF 0x30
+mat 6
+refs 4
+34 0 0
+33 0 0
+46 0 0
+45 0 0
+SURF 0x30
+mat 6
+refs 4
+33 0 0
+32 0 0
+47 0 0
+46 0 0
+SURF 0x30
+mat 6
+refs 3
+46 0 0
+47 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+45 0 0
+46 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+44 0 0
+45 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+43 0 0
+44 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+42 0 0
+43 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+41 0 0
+42 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+40 0 0
+41 0 0
+48 0 0
+SURF 0x30
+mat 6
+refs 3
+47 0 0
+40 0 0
+48 0 0
+kids 0
+OBJECT poly
+name "CabinPressModeBtn1F"
+loc 0.000175806 -0.17185 -0.11335
+data 8
+Cube.061
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.01 -0.0364 0.0314
+-0.01 -0.0364 0.0514
+-0.007 -0.0364 0.0514
+-0.007 -0.0364 0.0314
+-0.01 -0.0464 0.0314
+-0.01 -0.0464 0.0514
+-0.007 -0.0464 0.0514
+-0.007 -0.0464 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.5
+7 0.5 0.25
+4 0.5 0.25
+0 0.5 0.5
+SURF 0x0
+mat 4
+refs 4
+6 0 0.25
+2 9.31321e-008 0.5
+1 9.31321e-008 0.5
+5 0 0.25
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.25
+3 0.5 0.5
+2 9.31321e-008 0.5
+6 0 0.25
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.5
+0 0.5 0.5
+1 9.31321e-008 0.5
+2 9.31321e-008 0.5
+kids 0
+OBJECT poly
+name "CabinPressModeBtn2O"
+loc 0.000175806 -0.17185 -0.11335
+data 8
+Cube.062
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.007 -0.0564 0.0314
+-0.007 -0.0564 0.0514
+-0.01 -0.0564 0.0514
+-0.01 -0.0564 0.0314
+-0.007 -0.0464 0.0314
+-0.007 -0.0464 0.0514
+-0.01 -0.0464 0.0514
+-0.01 -0.0464 0.0314
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+1 0 1.19209e-007
+2 0 1.19209e-007
+3 0.5 0
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+4 0.5 0.25
+5 9.31321e-008 0.25
+1 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+1 0 1.19209e-007
+5 9.31321e-008 0.25
+6 9.31321e-008 0.25
+2 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0
+3 0.5 0
+7 0.5 0.25
+kids 0
 OBJECT poly
 name "FuelXfeedBtn2O"
 loc 0.000175806 0.13925 0.0418499
@@ -25631,66 +26155,6 @@ refs 3
 142 0.695207 0.69137
 kids 0
 OBJECT poly
-name "MarkingLts"
-loc 0.00126776 -5.00064e-005 -5.00083e-005
-data 9
-Plane.007
-texture "markings.png"
-crease 30.000000
-numvert 10
--0.009885 -0.325 0.165
--0.009885 -0.325 -0.165
-0.010085 0.325 -0.324757
-0.010085 -0.235 -0.324757
-0.010085 0.325 0.324757
-0.010085 -0.235 0.324757
--0.009885 0.325 -0.165
--0.009885 0.325 0.165
--0.009885 -0.235 0.165
--0.009885 -0.235 -0.165
-numsurf 6
-SURF 0x0
-mat 7
-refs 3
-3 0.97 0.138461
-9 0.731415 0.138462
-1 0.731415 0
-SURF 0x0
-mat 7
-refs 3
-8 0.238585 0.138462
-5 0 0.138462
-0 0.238585 0
-SURF 0x0
-mat 7
-refs 4
-9 0.731415 0.138462
-8 0.238585 0.138462
-0 0.238585 0
-1 0.731415 0
-SURF 0x0
-mat 7
-refs 4
-6 0.731415 1
-9 0.731415 0.138462
-3 0.97 0.138461
-2 0.97 1
-SURF 0x0
-mat 7
-refs 4
-8 0.238585 0.138462
-7 0.238585 1
-4 1.7803e-007 1
-5 0 0.138462
-SURF 0x0
-mat 7
-refs 4
-9 0.731415 0.138462
-6 0.731415 1
-7 0.238585 1
-8 0.238585 0.138462
-kids 0
-OBJECT poly
 name "NavLogoLtSwtch"
 loc 0.000113685 -5.00064e-005 -4.99785e-005
 data 12
@@ -27482,292 +27946,6 @@ refs 4
 4 0.5 0.5
 kids 0
 OBJECT poly
-name "PressVSCtl"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
-data 12
-Cylinder.061
-crease 30.000000
-numvert 37
--0.0078 -0.221417 -0.045017
--0.0078 -0.222484 -0.043168
--0.0078 -0.222484 -0.041032
--0.0078 -0.221417 -0.039183
--0.0078 -0.219568 -0.038116
--0.0078 -0.217432 -0.038116
--0.0078 -0.215583 -0.039183
--0.0078 -0.214516 -0.041032
--0.0078 -0.214516 -0.043168
--0.0078 -0.215583 -0.045017
--0.0078 -0.217432 -0.046084
--0.0078 -0.219568 -0.046084
--0.0078 -0.2185 -0.0421
--0.0098 -0.219568 -0.046084
--0.0098 -0.217432 -0.046084
--0.0098 -0.215583 -0.045017
--0.0098 -0.214516 -0.043168
--0.0098 -0.214516 -0.041032
--0.0098 -0.215583 -0.039183
--0.0098 -0.217432 -0.038116
--0.0098 -0.219568 -0.038116
--0.0098 -0.221417 -0.039183
--0.0098 -0.222484 -0.041032
--0.0098 -0.222484 -0.043168
--0.0098 -0.221417 -0.045017
--0.0098 -0.223803 -0.047403
--0.0098 -0.225744 -0.044041
--0.0098 -0.225744 -0.040159
--0.0098 -0.223803 -0.036797
--0.0098 -0.220441 -0.034856
--0.0098 -0.216559 -0.034856
--0.0098 -0.213197 -0.036797
--0.0098 -0.211256 -0.040159
--0.0098 -0.211256 -0.044041
--0.0098 -0.213197 -0.047403
--0.0098 -0.216559 -0.049344
--0.0098 -0.220441 -0.049344
-numsurf 36
-SURF 0x20
-mat 1
-refs 3
-1 0 0
-0 0 0
-12 0 0
-SURF 0x20
-mat 1
-refs 3
-1 0 0
-12 0 0
-2 0 0
-SURF 0x20
-mat 1
-refs 3
-2 0 0
-12 0 0
-3 0 0
-SURF 0x20
-mat 1
-refs 3
-3 0 0
-12 0 0
-4 0 0
-SURF 0x20
-mat 1
-refs 3
-4 0 0
-12 0 0
-5 0 0
-SURF 0x20
-mat 1
-refs 3
-5 0 0
-12 0 0
-6 0 0
-SURF 0x20
-mat 1
-refs 3
-6 0 0
-12 0 0
-7 0 0
-SURF 0x20
-mat 1
-refs 3
-7 0 0
-12 0 0
-8 0 0
-SURF 0x20
-mat 1
-refs 3
-8 0 0
-12 0 0
-9 0 0
-SURF 0x20
-mat 1
-refs 3
-9 0 0
-12 0 0
-10 0 0
-SURF 0x20
-mat 1
-refs 3
-10 0 0
-12 0 0
-11 0 0
-SURF 0x20
-mat 1
-refs 3
-11 0 0
-12 0 0
-0 0 0
-SURF 0x20
-mat 1
-refs 4
-24 0 0
-0 0 0
-1 0 0
-23 0 0
-SURF 0x20
-mat 1
-refs 4
-23 0 0
-1 0 0
-2 0 0
-22 0 0
-SURF 0x20
-mat 1
-refs 4
-22 0 0
-2 0 0
-3 0 0
-21 0 0
-SURF 0x20
-mat 1
-refs 4
-21 0 0
-3 0 0
-4 0 0
-20 0 0
-SURF 0x20
-mat 1
-refs 4
-20 0 0
-4 0 0
-5 0 0
-19 0 0
-SURF 0x20
-mat 1
-refs 4
-19 0 0
-5 0 0
-6 0 0
-18 0 0
-SURF 0x20
-mat 1
-refs 4
-18 0 0
-6 0 0
-7 0 0
-17 0 0
-SURF 0x20
-mat 1
-refs 4
-17 0 0
-7 0 0
-8 0 0
-16 0 0
-SURF 0x20
-mat 1
-refs 4
-16 0 0
-8 0 0
-9 0 0
-15 0 0
-SURF 0x20
-mat 1
-refs 4
-15 0 0
-9 0 0
-10 0 0
-14 0 0
-SURF 0x20
-mat 1
-refs 4
-14 0 0
-10 0 0
-11 0 0
-13 0 0
-SURF 0x20
-mat 1
-refs 4
-13 0 0
-11 0 0
-0 0 0
-24 0 0
-SURF 0x20
-mat 1
-refs 4
-36 0 0
-13 0 0
-24 0 0
-25 0 0
-SURF 0x20
-mat 1
-refs 4
-13 0 0
-36 0 0
-35 0 0
-14 0 0
-SURF 0x20
-mat 1
-refs 4
-34 0 0
-15 0 0
-14 0 0
-35 0 0
-SURF 0x20
-mat 1
-refs 4
-33 0 0
-16 0 0
-15 0 0
-34 0 0
-SURF 0x20
-mat 1
-refs 4
-32 0 0
-17 0 0
-16 0 0
-33 0 0
-SURF 0x20
-mat 1
-refs 4
-31 0 0
-18 0 0
-17 0 0
-32 0 0
-SURF 0x20
-mat 1
-refs 4
-30 0 0
-19 0 0
-18 0 0
-31 0 0
-SURF 0x20
-mat 1
-refs 4
-29 0 0
-20 0 0
-19 0 0
-30 0 0
-SURF 0x20
-mat 1
-refs 4
-28 0 0
-21 0 0
-20 0 0
-29 0 0
-SURF 0x20
-mat 1
-refs 4
-27 0 0
-22 0 0
-21 0 0
-28 0 0
-SURF 0x20
-mat 1
-refs 4
-26 0 0
-23 0 0
-22 0 0
-27 0 0
-SURF 0x20
-mat 1
-refs 4
-25 0 0
-24 0 0
-23 0 0
-26 0 0
-kids 0
-OBJECT poly
 name "RFuelTank1Btn1"
 loc 0.000113685 -5.00064e-005 -4.99785e-005
 data 8
@@ -34681,3 +34859,157 @@ refs 4
 5 0.5 0
 4 1 0
 kids 0
+OBJECT poly
+name "MarkingLts"
+loc 0.00126776 -5.00064e-005 -5.00083e-005
+data 9
+Plane.007
+texture "markings.png"
+crease 30.000000
+numvert 10
+-0.009885 -0.325 0.165
+-0.009885 -0.325 -0.165
+0.010085 0.325 -0.324757
+0.010085 -0.235 -0.324757
+0.010085 0.325 0.324757
+0.010085 -0.235 0.324757
+-0.009885 0.325 -0.165
+-0.009885 0.325 0.165
+-0.009885 -0.235 0.165
+-0.009885 -0.235 -0.165
+numsurf 6
+SURF 0x0
+mat 7
+refs 3
+3 0.97 0.138461
+9 0.731415 0.138462
+1 0.731415 0
+SURF 0x0
+mat 7
+refs 3
+8 0.238585 0.138462
+5 0 0.138462
+0 0.238585 0
+SURF 0x0
+mat 7
+refs 4
+9 0.731415 0.138462
+8 0.238585 0.138462
+0 0.238585 0
+1 0.731415 0
+SURF 0x0
+mat 7
+refs 4
+6 0.731415 1
+9 0.731415 0.138462
+3 0.97 0.138461
+2 0.97 1
+SURF 0x0
+mat 7
+refs 4
+8 0.238585 0.138462
+7 0.238585 1
+4 1.7803e-007 1
+5 0 0.138462
+SURF 0x0
+mat 7
+refs 4
+9 0.731415 0.138462
+6 0.731415 1
+7 0.238585 1
+8 0.238585 0.138462
+kids 0
+OBJECT poly
+name "SwitchSockets"
+loc 0.000113685 0.0463271 -0.189928
+data 12
+Cylinder.025
+crease 30.000000
+numvert 13
+-0.0098 -0.265 0.1478
+-0.0098 -0.266553 0.142005
+-0.0098 -0.263447 0.142005
+-0.0098 -0.260757 0.143558
+-0.0098 -0.259204 0.146247
+-0.0098 -0.259204 0.149353
+-0.0098 -0.260757 0.152043
+-0.0098 -0.263447 0.153596
+-0.0098 -0.266553 0.153596
+-0.0098 -0.269243 0.152043
+-0.0098 -0.270796 0.149353
+-0.0098 -0.270796 0.146247
+-0.0098 -0.269243 0.143557
+numsurf 12
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+12 0 0
+1 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+1 0 0
+2 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+2 0 0
+3 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+3 0 0
+4 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+4 0 0
+5 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+5 0 0
+6 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+6 0 0
+7 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+7 0 0
+8 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+8 0 0
+9 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+9 0 0
+10 0 0
+SURF 0x20
+mat 1
+refs 3
+0 0 0
+10 0 0
+11 0 0
+SURF 0x20
+mat 1
+refs 3
+11 0 0
+12 0 0
+0 0 0
+kids 0
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index 2052ade4..7b564be6 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -1,5 +1,5 @@
-# Airbus A3XX FBW System by Joshua Davidson (it0uchpods)
-# V0.9.8
+# Airbus A3XX FBW/Flight Control Computer System
+# Joshua Davidson (it0uchpods)
 
 ###################
 # Update Function #
diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas
index 38e1a386..5276953e 100644
--- a/Nasal/pneumatics.nas
+++ b/Nasal/pneumatics.nas
@@ -16,6 +16,7 @@ var pneu_init = func {
 	setprop("/controls/pneumatic/switches/ram-air", 0);
 	setprop("/controls/pneumatic/switches/pack-flo", 9); # LO: 7, NORM: 9, HI: 11.
 	setprop("/controls/pneumatic/switches/xbleed", 1); # SHUT: 0, AUTO: 1, OPEN: 2. # I will simulate later, once I get the knob animated. -JD
+	setprop("/controls/pressurization/auto", 1);
 	setprop("/systems/pneumatic/bleed1", 0);
 	setprop("/systems/pneumatic/bleed2", 0);
 	setprop("/systems/pneumatic/bleedapu", 0);
@@ -48,53 +49,9 @@ var press_init = func {
 	setprop("/systems/pressurization/diff-to-target", "0");
 }
 
-##############
-# Main Loops #
-##############
-var master_press = func {
-	var phase = getprop("/FMGC/status/phase");
-	var pressmode = getprop("/systems/pressurization/mode");
-	var state1 = getprop("/systems/thrust/state1");
-	var state2 = getprop("/systems/thrust/state2");
-	var wowl = getprop("/gear/gear[1]/wow");
-	var wowr = getprop("/gear/gear[2]/wow");
-	var deltap = getprop("/systems/pressurization/deltap");
-	var outflow = getprop("/systems/pressurization/outflowpos"); 
-	var speed = getprop("/velocities/groundspeed-kt");
-	var cabinalt = getprop("/systems/pressurization/cabinalt");
-	var dep_apt = getprop("autopilot/route-manager/departure/airport");
-	var airport_dep_elev_ft = getprop("autopilot/route-manager/departure/field-elevation-ft");
-	var altitude = getprop("/position/altitude-ft");
-	var airport_arr_elev_ft = getprop("autopilot/route-manager/destination/field-elevation-ft");
-	var vs = getprop("/systems/pressurization/vs-norm");
-	var outflowpos = getprop("/systems/pressurization/outflowpos");
-	var cabinalt = getprop("/systems/pressurization/cabinalt");
-	var targetalt = getprop("/systems/pressurization/targetalt");
-	var targetvs = getprop("/systems/pressurization/targetvs");
-	var ambient = getprop("/systems/pressurization/ambientpsi");
-	var cabinpsi = getprop("/systems/pressurization/cabinpsi");
-	
-	setprop("/systems/pressurization/diff-to-target", targetalt - cabinalt); 
-	setprop("/systems/pressurization/deltap", cabinpsi - ambient); 
-	# switch mode to TO
-	if ((pressmode == "GN") and (pressmode != "CL") and (wowl and wowr) and ((state1 == "MCT") or (state1 == "TOGA")) and ((state2 == "MCT") or (state2 == "TOGA"))) {
-		setprop("/systems/pressurization/mode", "TO");
-	}
-	
-	# switch mode to CLB
-	if (((!wowl) or (!wowr)) and (speed > 100) and (pressmode == "TO")) {
-		setprop("/systems/pressurization/mode", "CL");	
-	}
-	
-	if (vs != targetvs and !wowl and !wowr) {
-		setprop("/systems/pressurization/vs", targetvs);
-	}
-	
-	if (cabinalt != targetalt and !wowl and !wowr) {
-		setprop("/systems/pressurization/cabinalt", cabinalt + vs);
-	}
-}
-
+#######################
+# Main Pneumatic Loop #
+#######################
 
 var master_pneu = func {
 	var bleed1_sw = getprop("/controls/pneumatic/switches/bleed1");
@@ -190,6 +147,47 @@ var master_pneu = func {
 	}
 	
 	var total_psi = getprop("/systems/pneumatic/total-psi");
+	
+	var phase = getprop("/FMGC/status/phase");
+	var pressmode = getprop("/systems/pressurization/mode");
+	var state1 = getprop("/systems/thrust/state1");
+	var state2 = getprop("/systems/thrust/state2");
+	var wowl = getprop("/gear/gear[1]/wow");
+	var wowr = getprop("/gear/gear[2]/wow");
+	var deltap = getprop("/systems/pressurization/deltap");
+	var outflow = getprop("/systems/pressurization/outflowpos"); 
+	var speed = getprop("/velocities/groundspeed-kt");
+	var cabinalt = getprop("/systems/pressurization/cabinalt");
+	var dep_apt = getprop("autopilot/route-manager/departure/airport");
+	var airport_dep_elev_ft = getprop("autopilot/route-manager/departure/field-elevation-ft");
+	var altitude = getprop("/position/altitude-ft");
+	var airport_arr_elev_ft = getprop("autopilot/route-manager/destination/field-elevation-ft");
+	var vs = getprop("/systems/pressurization/vs-norm");
+	var outflowpos = getprop("/systems/pressurization/outflowpos");
+	var cabinalt = getprop("/systems/pressurization/cabinalt");
+	var targetalt = getprop("/systems/pressurization/targetalt");
+	var targetvs = getprop("/systems/pressurization/targetvs");
+	var ambient = getprop("/systems/pressurization/ambientpsi");
+	var cabinpsi = getprop("/systems/pressurization/cabinpsi");
+	
+	setprop("/systems/pressurization/diff-to-target", targetalt - cabinalt); 
+	setprop("/systems/pressurization/deltap", cabinpsi - ambient); 
+
+	if ((pressmode == "GN") and (pressmode != "CL") and (wowl and wowr) and ((state1 == "MCT") or (state1 == "TOGA")) and ((state2 == "MCT") or (state2 == "TOGA"))) {
+		setprop("/systems/pressurization/mode", "TO");
+	}
+	
+	if (((!wowl) or (!wowr)) and (speed > 100) and (pressmode == "TO")) {
+		setprop("/systems/pressurization/mode", "CL");	
+	}
+	
+	if (vs != targetvs and !wowl and !wowr) {
+		setprop("/systems/pressurization/vs", targetvs);
+	}
+	
+	if (cabinalt != targetalt and !wowl and !wowr) {
+		setprop("/systems/pressurization/cabinalt", cabinalt + vs);
+	}
 }
 
 ###################
@@ -198,7 +196,6 @@ var master_pneu = func {
 
 var update_pneumatic = func {
 	master_pneu();
-	master_press();
 }
 
 var pneu_timer = maketimer(0.2, update_pneumatic);