diff --git a/A320-main.xml b/A320-main.xml
index 4ce7b8e9..56b05b16 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -443,7 +443,7 @@
 			<slats>0</slats>
 		</flight>
 		<gear>
-			<brake-parking type="bool">true</brake-parking>
+			<brake-parking type="bool">0</brake-parking>
             <tiller-cmd-norm type="double">0</tiller-cmd-norm>
 			<tiller-enabled type="bool">0</tiller-enabled>
 		</gear>
@@ -460,7 +460,7 @@
 			<overhead-panel-norm type="double">0.0</overhead-panel-norm>
 			<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>
 			<strobe type="bool">0</strobe>
-			<taxi-light-switch type="bool">0</taxi-light-switch>
+			<taxi-light-switch type="float">0</taxi-light-switch>
 		</lighting>
 		<switches>
 			<!-- Smoking is bad :P -->
@@ -515,36 +515,6 @@
 	</gear>
 	
 	<systems>
-		<failures n="0">
-			<aileron-left type="bool">0</aileron-left>
-			<aileron-right type="bool">0</aileron-right>
-			<elevator-left type="bool">0</elevator-left>
-			<elevator-right type="bool">0</elevator-right>
-			<rudder type="bool">0</rudder>
-			<spoiler-left type="bool">0</spoiler-left>
-			<spoiler-right type="bool">0</spoiler-right>
-			<elec-ac-ess type="bool">0</elec-ac-ess>
-			<elec-batt1 type="bool">0</elec-batt1>
-			<elec-batt2 type="bool">0</elec-batt2>
-			<elec-galley type="bool">0</elec-galley>
-			<elec-genapu type="bool">0</elec-genapu>
-			<elec-gen1 type="bool">0</elec-gen1>
-			<elec-gen2 type="bool">0</elec-gen2>
-			<bleed-apu type="bool">0</bleed-apu>
-			<bleed-ext type="bool">0</bleed-ext>
-			<bleed-eng1 type="bool">0</bleed-eng1>
-			<bleed-eng2 type="bool">0</bleed-eng2>
-			<pack1 type="bool">0</pack1>
-			<pack2 type="bool">0</pack2>
-			<hyd-blue type="bool">0</hyd-blue>
-			<hyd-green type="bool">0</hyd-green>
-			<hyd-yellow type="bool">0</hyd-yellow>
-			<ptu type="bool">0</ptu>
-			<pump-blue type="bool">0</pump-blue>
-			<pump-green type="bool">0</pump-green>
-			<pump-yellow-eng type="bool">0</pump-yellow-eng>
-			<pump-yellow-elec type="bool">0</pump-yellow-elec>
-		</failures>
 		<fuel n="0">
 			<only-use-ctr-tank type="bool">0</only-use-ctr-tank>
 			<tank n="2">
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 0097d780..2e122c04 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -18,59 +18,19 @@ var spinning = maketimer(0.05, func {
 	}
 });
 
-setprop("/systems/acconfig/autoconfig-running", 0);
-setprop("/systems/acconfig/spinning", 0);
-setprop("/systems/acconfig/spin", "-");
-var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/A320Family/AircraftConfig/main.xml");
-var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/A320Family/AircraftConfig/welcome.xml");
-var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/A320Family/AircraftConfig/psload.xml");
-var ps_loaded_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psloaded/dialog", "Aircraft/A320Family/AircraftConfig/psloaded.xml");
-var init_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/init/dialog", "Aircraft/A320Family/AircraftConfig/ac_init.xml");
-var help_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/help/dialog", "Aircraft/A320Family/AircraftConfig/help.xml");
-var fbw_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/A320Family/AircraftConfig/fbw.xml");
-var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/A320Family/AircraftConfig/fail.xml");
-var fail_b_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/failb/dialog", "Aircraft/A320Family/AircraftConfig/fail-b.xml");
-spinning.start();
-init_dlg.open();
-
-setlistener("/sim/signals/fdm-initialized", func {
-	init_dlg.close();
-	welcome_dlg.open();
-	spinning.stop();
-});
-
-var saveSettings = func {
-	aircraft.data.add("/options/pfd/sidestick-pos", "/controls/adirs/skip");
-	aircraft.data.save();
-}
-
-saveSettings();
-
-var systemsReset = func {
-	systems.elec_init();
-	systems.ADIRSreset();
-	systems.pneu_init();
-	systems.hyd_init();
-	systems.press_init();
-	systems.fuel_init();
-	fmgc.FMGCinit();
-	mcdu1.MCDU_reset();
-	mcdu2.MCDU_reset();
-	fmgc.APinit();
-	setprop("/it-autoflight/input/fd1", 1);
-	setprop("/it-autoflight/input/fd2", 1);
-	libraries.ECAMinit();
-	libraries.variousReset();
-}
-
 var failReset = func {
+	setprop("/systems/failures/elac1", 0);
+	setprop("/systems/failures/elac2", 0);
+	setprop("/systems/failures/sec1", 0);
+	setprop("/systems/failures/sec2", 0);
+	setprop("/systems/failures/sec3", 0);
+	setprop("/systems/failures/fac1", 0);
+	setprop("/systems/failures/fac2", 0);
 	setprop("/systems/failures/aileron-left", 0);
 	setprop("/systems/failures/aileron-right", 0);
 	setprop("/systems/failures/elevator-left", 0);
 	setprop("/systems/failures/elevator-right", 0);
 	setprop("/systems/failures/rudder", 0);
-	setprop("/systems/failures/spoiler-left", 0);
-	setprop("/systems/failures/spoiler-right", 0);
 	setprop("/systems/failures/elec-ac-ess", 0);
 	setprop("/systems/failures/elec-batt1", 0);
 	setprop("/systems/failures/elec-batt2", 0);
@@ -94,19 +54,52 @@ var failReset = func {
 	setprop("/systems/failures/pump-yellow-elec", 0);
 }
 
-var failPage = func(page) {
-	if (page == 0) {
-		gui.popupTip("This is the first page!");
-	} else if (page == 1) {
-		fail_dlg.open();
-		fail_b_dlg.close();
-	} else if (page == 2) {
-		fail_dlg.close();
-		fail_b_dlg.open();
-#		fail_c_dlg.open(); # Fail C Doesn't exist yet!!! :)
-	} else if (page == 3) {
-		gui.popupTip("No Moar!");
-	}
+setprop("/systems/failures/spoiler-left", 0);
+setprop("/systems/failures/spoiler-right", 0); 
+failReset();
+setprop("/systems/acconfig/autoconfig-running", 0);
+setprop("/systems/acconfig/spinning", 0);
+setprop("/systems/acconfig/spin", "-");
+var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/A320Family/AircraftConfig/main.xml");
+var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/A320Family/AircraftConfig/welcome.xml");
+var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/A320Family/AircraftConfig/psload.xml");
+var ps_loaded_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psloaded/dialog", "Aircraft/A320Family/AircraftConfig/psloaded.xml");
+var init_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/init/dialog", "Aircraft/A320Family/AircraftConfig/ac_init.xml");
+var help_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/help/dialog", "Aircraft/A320Family/AircraftConfig/help.xml");
+var fbw_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/A320Family/AircraftConfig/fbw.xml");
+var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/A320Family/AircraftConfig/fail.xml");
+spinning.start();
+init_dlg.open();
+
+setlistener("/sim/signals/fdm-initialized", func {
+	init_dlg.close();
+	welcome_dlg.open();
+	spinning.stop();
+});
+
+var saveSettings = func {
+	aircraft.data.add("/options/pfd/sidestick-pos", "/controls/adirs/skip");
+	aircraft.data.save();
+}
+
+saveSettings();
+
+var systemsReset = func {
+	fbw.fctlInit();
+	systems.elec_init();
+	systems.ADIRSreset();
+	systems.pneu_init();
+	systems.hyd_init();
+	systems.press_init();
+	systems.fuel_init();
+	fmgc.FMGCinit();
+	mcdu1.MCDU_reset();
+	mcdu2.MCDU_reset();
+	fmgc.APinit();
+	setprop("/it-autoflight/input/fd1", 1);
+	setprop("/it-autoflight/input/fd2", 1);
+	libraries.ECAMinit();
+	libraries.variousReset();
 }
 
 ################
@@ -130,6 +123,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 +168,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 +244,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/AircraftConfig/fail-b.xml b/AircraftConfig/fail-b.xml
deleted file mode 100644
index eaa93068..00000000
--- a/AircraftConfig/fail-b.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- A3XX Aircraft Config Dialog -->
-
-
-<PropertyList>
-
-	<name>aircraft-config-failb</name>
-	<layout>vbox</layout>
-
-    <group>
-        <layout>hbox</layout>
-        <text>
-            <halign>left</halign>
-            <label>System Failures (2)</label>
-        </text>
-        <button>
-            <halign>right</halign>
-            <pref-width>20</pref-width>
-            <pref-height>20</pref-height>
-            <legend>X</legend>
-            <key>Esc</key>
-            <binding>
-                <command>dialog-close</command>
-            </binding>
-        </button>
-    </group>
-	
-    <hrule/>
-	
-	<group>
-		<layout>vbox</layout>
-		
-        <text>
-            <halign>left</halign>
-            <label>Failed when Checked</label>
-        </text>
-		
-		<group>
-			<layout>hbox</layout>
-
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-			<text>
-				<label>PNEU SYS Fail</label>
-			</text>
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-		</group>
-		
-		<checkbox>
-			<label>Bleed APU</label>
-			<halign>left</halign>
-			<property>/systems/failures/bleed-apu</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Bleed EXT</label>
-			<halign>left</halign>
-			<property>/systems/failures/bleed-ext</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Bleed ENG 1</label>
-			<halign>left</halign>
-			<property>/systems/failures/bleed-eng1</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Bleed ENG 2</label>
-			<halign>left</halign>
-			<property>/systems/failures/bleed-eng2</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Pack 1</label>
-			<halign>left</halign>
-			<property>/systems/failures/pack1</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Pack 2</label>
-			<halign>left</halign>
-			<property>/systems/failures/pack2</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<hrule/>
-		
-		<group>
-			<layout>hbox</layout>
-			
-			<button>
-				<legend>&lt;</legend>
-				<halign>center</halign>
-				<pref-width>30</pref-width>
-				<binding>
-					<command>nasal</command>
-					<script>
-					acconfig.failPage(1);
-					</script>
-				</binding>
-			</button>
-		
-			<button>
-				<legend>Reset All</legend>
-				<halign>center</halign>
-				<padding>5</padding>
-				<binding>
-					<command>nasal</command>
-					<script>
-					acconfig.failReset();
-					</script>
-				</binding>
-			</button>
-			
-			<button>
-				<legend>&gt;</legend>
-				<halign>center</halign>
-				<pref-width>30</pref-width>
-				<binding>
-					<command>nasal</command>
-					<script>
-					acconfig.failPage(3);
-					</script>
-				</binding>
-			</button>
-			
-		</group>
-
-	</group>
-	
-</PropertyList>
diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml
index 362b1c3b..b791def4 100644
--- a/AircraftConfig/fail.xml
+++ b/AircraftConfig/fail.xml
@@ -28,287 +28,407 @@
 	
     <hrule/>
 	
+	<text>
+		<halign>left</halign>
+		<label>Failed when Checked</label>
+	</text>
+	
 	<group>
-		<layout>vbox</layout>
-		
-        <text>
-            <halign>left</halign>
-            <label>Failed when Checked</label>
-        </text>
-		
+		<layout>hbox</layout>
+	
 		<group>
-			<layout>hbox</layout>
-
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-			<text>
-				<label>FCTL SYS Fail</label>
-			</text>
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-		</group>
-		
-		<checkbox>
-			<label>Aileron Left</label>
-			<halign>left</halign>
-			<property>/systems/failures/aileron-left</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Aileron Right</label>
-			<halign>left</halign>
-			<property>/systems/failures/aileron-right</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Elevator Left</label>
-			<halign>left</halign>
-			<property>/systems/failures/elevator-left</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Elevator Right</label>
-			<halign>left</halign>
-			<property>/systems/failures/elevator-right</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Rudder</label>
-			<halign>left</halign>
-			<property>/systems/failures/rudder</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Spoiler Left</label>
-			<halign>left</halign>
-			<property>/systems/failures/spoiler-left</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Spoiler Right</label>
-			<halign>left</halign>
-			<property>/systems/failures/spoiler-right</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<group>
-			<layout>hbox</layout>
-
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-			<text>
-				<label>ELEC SYS Fail</label>
-			</text>
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-		</group>
-		
-		<checkbox>
-			<label>AC ESS Bus</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-ac-ess</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>APU GEN</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-genapu</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>BATT 1 Fail</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-batt1</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>BATT 2 Fail</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-batt2</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>ENG 1 GEN</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-gen1</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>ENG 2 GEN</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-gen2</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Galley Bus</label>
-			<halign>left</halign>
-			<property>/systems/failures/elec-galley</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<group>
-			<layout>hbox</layout>
-
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-			<text>
-				<label>HYD SYS Fail</label>
-			</text>
-			<hrule>
-				<stretch type="bool">true</stretch>
-			</hrule>
-		</group>
-		
-		<checkbox>
-			<label>Blue HYD Leak</label>
-			<halign>left</halign>
-			<property>/systems/failures/hyd-blue</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Blue ELEC Pump</label>
-			<halign>left</halign>
-			<property>/systems/failures/pump-blue</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Green HYD Leak</label>
-			<halign>left</halign>
-			<property>/systems/failures/hyd-green</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Green ENG 1 Pump</label>
-			<halign>left</halign>
-			<property>/systems/failures/pump-green</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Yellow HYD Leak</label>
-			<halign>left</halign>
-			<property>/systems/failures/hyd-yellow</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Yellow ENG 2 Pump</label>
-			<halign>left</halign>
-			<property>/systems/failures/pump-yellow-eng</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<checkbox>
-			<label>Yellow ELEC Pump</label>
-			<halign>left</halign>
-			<property>/systems/failures/pump-yellow-elec</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<live>true</live>
-		</checkbox>
-		
-		<hrule/>
-		
-		<group>
-			<layout>hbox</layout>
+			<layout>vbox</layout>
 			
-			<button>
-				<legend>&lt;</legend>
-				<halign>center</halign>
-				<pref-width>30</pref-width>
+			<group>
+				<layout>hbox</layout>
+
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+				<text>
+					<label>FCTL SYS Fail</label>
+				</text>
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+			</group>
+			
+			<checkbox>
+				<label>Aileron Left</label>
+				<halign>left</halign>
+				<property>/systems/failures/aileron-left</property>
 				<binding>
-					<command>nasal</command>
-					<script>
-					acconfig.failPage(0);
-					</script>
+					<command>dialog-apply</command>
 				</binding>
-			</button>
-		
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Aileron Right</label>
+				<halign>left</halign>
+				<property>/systems/failures/aileron-right</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Elevator Left</label>
+				<halign>left</halign>
+				<property>/systems/failures/elevator-left</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Elevator Right</label>
+				<halign>left</halign>
+				<property>/systems/failures/elevator-right</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Rudder</label>
+				<halign>left</halign>
+				<property>/systems/failures/rudder</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>ELAC1</label>
+				<halign>left</halign>
+				<property>/systems/failures/elac1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>ELAC2</label>
+				<halign>left</halign>
+				<property>/systems/failures/elac2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>SEC1</label>
+				<halign>left</halign>
+				<property>/systems/failures/sec1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>SEC2</label>
+				<halign>left</halign>
+				<property>/systems/failures/sec2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>SEC3</label>
+				<halign>left</halign>
+				<property>/systems/failures/sec3</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>FAC2</label>
+				<halign>left</halign>
+				<property>/systems/failures/fac2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>FAC1</label>
+				<halign>left</halign>
+				<property>/systems/failures/fac1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<group>
+				<layout>hbox</layout>
+
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+				<text>
+					<label>ELEC SYS Fail</label>
+				</text>
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+			</group>
+			
+			<checkbox>
+				<label>AC ESS Bus</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-ac-ess</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>APU GEN</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-genapu</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>BATT 1 Fail</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-batt1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>BATT 2 Fail</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-batt2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>ENG 1 GEN</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-gen1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>ENG 2 GEN</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-gen2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Galley Bus</label>
+				<halign>left</halign>
+				<property>/systems/failures/elec-galley</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+		</group>
+			
+		<vrule/>
+			
+		<group>
+			<layout>vbox</layout>
+			
+			<group>
+				<layout>hbox</layout>
+
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+				<text>
+					<label>HYD SYS Fail</label>
+				</text>
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+			</group>
+			
+			<checkbox>
+				<label>Blue HYD Leak</label>
+				<halign>left</halign>
+				<property>/systems/failures/hyd-blue</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Blue ELEC Pump</label>
+				<halign>left</halign>
+				<property>/systems/failures/pump-blue</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Green HYD Leak</label>
+				<halign>left</halign>
+				<property>/systems/failures/hyd-green</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Green ENG 1 Pump</label>
+				<halign>left</halign>
+				<property>/systems/failures/pump-green</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Yellow HYD Leak</label>
+				<halign>left</halign>
+				<property>/systems/failures/hyd-yellow</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Yellow ENG 2 Pump</label>
+				<halign>left</halign>
+				<property>/systems/failures/pump-yellow-eng</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Yellow ELEC Pump</label>
+				<halign>left</halign>
+				<property>/systems/failures/pump-yellow-elec</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<group>
+				<layout>hbox</layout>
+
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+				<text>
+					<label>PNEU SYS Fail</label>
+				</text>
+				<hrule>
+					<stretch type="bool">true</stretch>
+				</hrule>
+			</group>
+			
+			<checkbox>
+				<label>Bleed APU</label>
+				<halign>left</halign>
+				<property>/systems/failures/bleed-apu</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Bleed EXT</label>
+				<halign>left</halign>
+				<property>/systems/failures/bleed-ext</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Bleed ENG 1</label>
+				<halign>left</halign>
+				<property>/systems/failures/bleed-eng1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Bleed ENG 2</label>
+				<halign>left</halign>
+				<property>/systems/failures/bleed-eng2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Pack 1</label>
+				<halign>left</halign>
+				<property>/systems/failures/pack1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<checkbox>
+				<label>Pack 2</label>
+				<halign>left</halign>
+				<property>/systems/failures/pack2</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+			
+			<hrule/>
+			
 			<button>
 				<legend>Reset All</legend>
 				<halign>center</halign>
 				<padding>5</padding>
+				<pref-width>120</pref-width>
 				<binding>
 					<command>nasal</command>
 					<script>
@@ -316,19 +436,7 @@
 					</script>
 				</binding>
 			</button>
-			
-			<button>
-				<legend>&gt;</legend>
-				<halign>center</halign>
-				<pref-width>30</pref-width>
-				<binding>
-					<command>nasal</command>
-					<script>
-					acconfig.failPage(2);
-					</script>
-				</binding>
-			</button>
-			
+				
 		</group>
 
 	</group>
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 30309a75..6b18a0c6 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -13,14 +13,26 @@
 		<object-name>ACPack1Btn2O</object-name>
 		<object-name>ACPack2Btn1F</object-name>
 		<object-name>ACPack2Btn2O</object-name>
+		<object-name>APUBleedBtn1F</object-name>
+		<object-name>APUBleedBtn2O</object-name>
+		<object-name>APUGenBtn1F</object-name>
+		<object-name>APUGenBtn2O</object-name>
+		<object-name>APUMasterBtn1F</object-name>
+		<object-name>APUMasterBtn2O</object-name>
+		<object-name>APUStartBtn1A</object-name>
+		<object-name>APUStartBtn2O</object-name>
 		<object-name>BatteryBtn11F</object-name>
 		<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>
@@ -47,14 +59,6 @@
 		<type>select</type>
 		<object-name>ACESSFeedBtn1F</object-name>
 		<object-name>ACESSFeedBtn2O</object-name>
-		<object-name>APUBleedBtn1F</object-name>
-		<object-name>APUBleedBtn2O</object-name>
-		<object-name>APUGenBtn1F</object-name>
-		<object-name>APUGenBtn2O</object-name>
-		<object-name>APUMasterBtn1F</object-name>
-		<object-name>APUMasterBtn2O</object-name>
-		<object-name>APUStartBtn1A</object-name>
-		<object-name>APUStartBtn2O</object-name>
 		<object-name>ADR1Btn1F</object-name>
 		<object-name>ADR1Btn2O</object-name>
 		<object-name>ADR2Btn1F</object-name>
@@ -63,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>
@@ -72,7 +75,6 @@
 		<object-name>Eng1BleedBtn2O</object-name>
 		<object-name>Eng2BleedBtn1F</object-name>
 		<object-name>Eng2BleedBtn2O</object-name>
-		<object-name>ExtPwrBtn2O</object-name>
 		<object-name>FuelModeBtn1F</object-name>
 		<object-name>FuelModeBtn2O</object-name>
 		<object-name>FuelXfeedBtn2O</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>
@@ -2354,6 +2711,16 @@
 					<property>/systems/failures/pack1</property>
 					<value>1</value>
 				</equals>
+				<and>
+					<equals>
+						<property>/controls/pneumatic/switches/pack1</property>
+						<value>1</value>
+					</equals>
+					<less-than-equals>
+						<property>/systems/pneumatic/pack1</property>
+						<value>5</value>
+					</less-than-equals>
+				</and>
 				<equals>
 					<property>/controls/switches/annun-test</property>
 					<value>1</value>
@@ -2390,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>
@@ -2445,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>
@@ -2500,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>
@@ -2554,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>
@@ -2609,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>
@@ -2628,6 +3071,16 @@
 					<property>/systems/failures/pack2</property>
 					<value>1</value>
 				</equals>
+				<and>
+					<equals>
+						<property>/controls/pneumatic/switches/pack2</property>
+						<value>1</value>
+					</equals>
+					<less-than-equals>
+						<property>/systems/pneumatic/pack2</property>
+						<value>5</value>
+					</less-than-equals>
+				</and>
 				<equals>
 					<property>/controls/switches/annun-test</property>
 					<value>1</value>
@@ -2661,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>
@@ -2693,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>
@@ -2985,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>
@@ -3040,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/electrical.nas b/Nasal/electrical.nas
index 740bd3e7..dd7c1bfa 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -13,13 +13,13 @@ var ac_hz_std = 400;
 
 var elec_init = func {
 	setprop("/controls/switches/annun-test", 0);
-	setprop("/controls/electrical/switches/galley", 0);
+	setprop("/controls/electrical/switches/galley", 1);
 	setprop("/controls/electrical/switches/idg1", 0);
 	setprop("/controls/electrical/switches/idg2", 0);
-	setprop("/controls/electrical/switches/gen1", 0);
-	setprop("/controls/electrical/switches/gen2", 0);
+	setprop("/controls/electrical/switches/gen1", 1);
+	setprop("/controls/electrical/switches/gen2", 1);
 	setprop("/controls/electrical/switches/emer-gen", 0);
-	setprop("/controls/electrical/switches/gen-apu", 0);
+	setprop("/controls/electrical/switches/gen-apu", 1);
 	setprop("/controls/electrical/switches/gen-ext", 0);
 	setprop("/controls/electrical/switches/apu-ext-crosstie", 1);
 	setprop("/controls/electrical/switches/ac-ess-feed", 1);
diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas
index 45ad9376..5968e386 100644
--- a/Nasal/hydraulics.nas
+++ b/Nasal/hydraulics.nas
@@ -6,9 +6,9 @@
 #############
 
 var hyd_init = func {
-	setprop("/controls/hydraulic/eng1-pump", 0);
-	setprop("/controls/hydraulic/eng2-pump", 0);
-	setprop("/controls/hydraulic/elec-pump-blue", 0);
+	setprop("/controls/hydraulic/eng1-pump", 1);
+	setprop("/controls/hydraulic/eng2-pump", 1);
+	setprop("/controls/hydraulic/elec-pump-blue", 1);
 	setprop("/controls/hydraulic/elec-pump-yellow", 0);
 	setprop("/controls/hydraulic/ptu", 1);
 	setprop("/controls/hydraulic/rat-man", 0);
@@ -18,6 +18,7 @@ var hyd_init = func {
 	setprop("/systems/hydraulic/blue-psi", 0);
 	setprop("/systems/hydraulic/green-psi", 0);
 	setprop("/systems/hydraulic/yellow-psi", 0);
+	setprop("/controls/gear/brake-parking", 0);
 	hyd_timer.start();
 }
 
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index 2052ade4..f692b3a1 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -1,5 +1,34 @@
-# Airbus A3XX FBW System by Joshua Davidson (it0uchpods)
-# V0.9.8
+# Airbus A3XX FBW/Flight Control Computer System
+# Joshua Davidson (it0uchpods)
+
+# 2 ELevator and Aileron Computers (ELAC)
+# Aileron Control
+# Normal Elevator / Stab Trim Control
+# 3 Spoiler Elevator Computers (SEC)
+# Spoiler Control
+# Standby Elevator / Stab Trim Control
+# 2 Flight Agumentation Computers (FAC)
+# Electric Rudder Control
+# 2 Flight Control Data Concentrators (FCDC)
+# Aquire data from ELAC and SEC and send it to the EIS and Centralized Fault Display System
+
+# If All ELACs Fail, Alternate Law
+
+var fctlInit = func {
+	setprop("/controls/fctl/elac1", 1);
+	setprop("/controls/fctl/elac2", 1);
+	setprop("/controls/fctl/sec1", 1);
+	setprop("/controls/fctl/sec2", 1);
+	setprop("/controls/fctl/sec3", 1);
+	setprop("/controls/fctl/fac1", 1);
+	setprop("/controls/fctl/fac2", 1);
+	setprop("/systems/fctl/elac1", 0);
+	setprop("/systems/fctl/elac2", 0);
+	setprop("/systems/fctl/sec1", 0);
+	setprop("/systems/fctl/sec2", 0);
+	setprop("/systems/fctl/fac1", 0);
+	setprop("/systems/fctl/fac2", 0);
+}
 
 ###################
 # Update Function #
@@ -7,6 +36,64 @@
 
 var update_loop = func {
 
+	var elac1_sw = getprop("/controls/fctl/elac1");
+	var elac2_sw = getprop("/controls/fctl/elac2");
+	var sec1_sw = getprop("/controls/fctl/sec1");
+	var sec2_sw = getprop("/controls/fctl/sec2");
+	var sec3_sw = getprop("/controls/fctl/sec3");
+	var fac1_sw = getprop("/controls/fctl/fac1");
+	var fac2_sw = getprop("/controls/fctl/fac2");
+	
+	var elac1_fail = getprop("/systems/failures/elac1");
+	var elac2_fail = getprop("/systems/failures/elac2");
+	var sec1_fail = getprop("/systems/failures/sec1");
+	var sec2_fail = getprop("/systems/failures/sec2");
+	var sec3_fail = getprop("/systems/failures/sec3");
+	var fac1_fail = getprop("/systems/failures/fac1");
+	var fac2_fail = getprop("/systems/failures/fac2");
+	
+	if (elac1_sw and !elac1_fail) {
+		setprop("/systems/fctl/elac1", 1);
+	} else {
+		setprop("/systems/fctl/elac1", 0);
+	}
+	
+	if (elac2_sw and !elac2_fail) {
+		setprop("/systems/fctl/elac2", 1);
+	} else {
+		setprop("/systems/fctl/elac2", 0);
+	}
+	
+	if (sec1_sw and !sec1_fail) {
+		setprop("/systems/fctl/sec1", 1);
+	} else {
+		setprop("/systems/fctl/sec1", 0);
+	}
+	
+	if (sec2_sw and !sec2_fail) {
+		setprop("/systems/fctl/sec2", 1);
+	} else {
+		setprop("/systems/fctl/sec2", 0);
+	}
+	
+	if (sec3_sw and !sec3_fail) {
+		setprop("/systems/fctl/sec3", 1);
+	} else {
+		setprop("/systems/fctl/sec3", 0);
+	}
+	
+	if (fac1_sw and !fac1_fail) {
+		setprop("/systems/fctl/fac1", 1);
+	} else {
+		setprop("/systems/fctl/fac1", 0);
+	}
+	
+	if (fac2_sw and !fac2_fail) {
+		setprop("/systems/fctl/fac2", 1);
+	} else {
+		setprop("/systems/fctl/fac2", 0);
+	}
+
 	var ail = getprop("/controls/flight/aileron");
 	
 	if (getprop("/it-fbw/law") == 0) {
@@ -86,4 +173,4 @@ setlistener("/sim/signals/fdm-initialized", func {
 ##########
 # Timers #
 ##########
-var updatet = maketimer(0.01, update_loop);
+var updatet = maketimer(0.05, update_loop);
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 09a111ce..88b6b97e 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -157,6 +157,7 @@ var triggerDoor = func(door, doorName, doorDesc) {
 #######################
  
 setlistener("/sim/signals/fdm-initialized", func {
+	fbw.fctlInit();
 	systems.elec_init();
 	systems.adirs_init();
 	systems.pneu_init();
diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas
index a1e1f11a..5276953e 100644
--- a/Nasal/pneumatics.nas
+++ b/Nasal/pneumatics.nas
@@ -6,16 +6,17 @@
 #############
 
 var pneu_init = func {
-	setprop("/controls/pneumatic/switches/bleed1", 0);
-	setprop("/controls/pneumatic/switches/bleed2", 0);
+	setprop("/controls/pneumatic/switches/bleed1", 1);
+	setprop("/controls/pneumatic/switches/bleed2", 1);
 	setprop("/controls/pneumatic/switches/bleedapu", 0);
 	setprop("/controls/pneumatic/switches/groundair", 0);
-	setprop("/controls/pneumatic/switches/pack1", 0);
-	setprop("/controls/pneumatic/switches/pack2", 0);
-	setprop("/controls/pneumatic/switches/hot-air", 0);
+	setprop("/controls/pneumatic/switches/pack1", 1);
+	setprop("/controls/pneumatic/switches/pack2", 1);
+	setprop("/controls/pneumatic/switches/hot-air", 1);
 	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");
@@ -156,7 +113,7 @@ var master_pneu = func {
 		setprop("/systems/pneumatic/pack1", 0);
 	}
 	
-	if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20 or ground >= 20) and eng1_starter == 0 and eng2_starter == 0 and !pack2_fail) {
+	if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20) and eng1_starter == 0 and eng2_starter == 0 and !pack2_fail) {
 		setprop("/systems/pneumatic/pack2", pack_flo_sw);
 	} else {
 		setprop("/systems/pneumatic/pack2", 0);
@@ -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);
diff --git a/Resources/fctlfail.png b/Resources/fctlfail.png
new file mode 100644
index 00000000..460c7687
Binary files /dev/null and b/Resources/fctlfail.png differ
diff --git a/Resources/fctlfail.txt b/Resources/fctlfail.txt
new file mode 100644
index 00000000..37adb6e0
--- /dev/null
+++ b/Resources/fctlfail.txt
@@ -0,0 +1,27 @@
+PITCH ALT, ROLL DCT, YAW ALT
+    TRIPLE ADR FAILURE
+    DOUBLE HYD FAILURE
+    SLATS LOCKED IN CLEAN (CONF 0 or 1)
+PITCH ALT (RED PROT), ROLL DCT, YAW ALT
+    DOUBLE ELAC FAILURE
+    SIDESTICK FAULT
+    DOUBLE ADR FAILURE
+    ALL SPOILERS LOST
+    THS JAMMED
+    3 SEC FAILED
+    ELAC 2 AND BLUE HYD FAILED
+    ELAC 1 AND GREEN HYD FAILED
+    ELAC 1 AND YELLOW HYD FAILED
+    ONE ELEV JAMMED
+    RAT OUT
+PITCH ALT (RED PROT), ROLL DCT, YAW MECH
+    2 FAC FAILED
+    YAW DAMPER FAILED
+    Y+G HYD FAILED
+PITCH DIRETCT, ROLL DIRECT, YAW ALT
+    RADIO ALT FAILED WHEN 
+        LDG DOWN
+        or
+        CONF 2, with BOTH LGCIUs failed
+    
+    
\ No newline at end of file
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index da8c1509..97e2b04a 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -209,16 +209,16 @@
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<expression>
-			<table>
+				<table>
 					<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-					<entry><ind> 0</ind><dep> 0</dep></entry>
+					<entry><ind>    0</ind><dep>   0</dep></entry>
 					<entry><ind> 1000</ind><dep> 500</dep></entry>
-					<entry><ind> 5000</ind><dep> 1100</dep></entry>
-					<entry><ind> 20000</ind><dep> 5200</dep></entry>
-					<entry><ind> 30000</ind><dep> 6700</dep></entry>
-					<entry><ind> 30000</ind><dep> 7900</dep></entry>
-					<entry><ind> 40500</ind><dep> 8000</dep></entry>
-					</table>
+					<entry><ind> 5000</ind><dep>1100</dep></entry>
+					<entry><ind>20000</ind><dep>5200</dep></entry>
+					<entry><ind>30000</ind><dep>6700</dep></entry>
+					<entry><ind>30000</ind><dep>7900</dep></entry>
+					<entry><ind>40500</ind><dep>8000</dep></entry>
+				</table>
 			</expression>
 		</input>
 		<output>/systems/pressurization/targetalt</output>		
@@ -233,14 +233,14 @@
 			<expression>
 				<table>
 					<property>/systems/pressurization/cabinalt-norm</property>
-					<entry><ind> -1000</ind><dep> 16.5</dep></entry>
-					<entry><ind> 0</ind><dep> 14.7</dep></entry>
+					<entry><ind>-1000</ind><dep> 16.5</dep></entry>
+					<entry><ind>    0</ind><dep> 14.7</dep></entry>
 					<entry><ind> 1000</ind><dep> 14.6</dep></entry>
 					<entry><ind> 5000</ind><dep> 14.4</dep></entry>
-					<entry><ind> 20000</ind><dep> 12.1</dep></entry>
-					<entry><ind> 30000</ind><dep> 11.4</dep></entry>
-					<entry><ind> 30000</ind><dep> 11.0</dep></entry>
-					<entry><ind> 40500</ind><dep> 10.9</dep></entry>
+					<entry><ind>20000</ind><dep> 12.1</dep></entry>
+					<entry><ind>30000</ind><dep> 11.4</dep></entry>
+					<entry><ind>30000</ind><dep> 11.0</dep></entry>
+					<entry><ind>40500</ind><dep> 10.9</dep></entry>
 				</table>
 			</expression>
 		</input>
@@ -256,8 +256,8 @@
 			<expression>
 				<table>
 					<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-					<entry><ind> -1000</ind><dep> 16.5</dep></entry>
-					<entry><ind> 0</ind><dep> 14.7</dep></entry>
+					<entry><ind>-1000</ind><dep> 16.5</dep></entry>
+					<entry><ind>    0</ind><dep> 14.7</dep></entry>
 					<entry><ind> 1000</ind><dep> 14.2</dep></entry>
 					<entry><ind> 2000</ind><dep> 13.6</dep></entry>
 					<entry><ind> 3000</ind><dep> 13.2</dep></entry>
@@ -267,29 +267,30 @@
 					<entry><ind> 7000</ind><dep> 11.3</dep></entry>
 					<entry><ind> 8000</ind><dep> 10.9</dep></entry>
 					<entry><ind> 9000</ind><dep> 10.5</dep></entry>
-					<entry><ind> 10000</ind><dep> 10.1</dep></entry>
-					<entry><ind> 11000</ind><dep> 9.7</dep></entry>
-					<entry><ind> 12000</ind><dep> 9.3</dep></entry>
-					<entry><ind> 13000</ind><dep> 9</dep></entry>
-					<entry><ind> 14000</ind><dep> 8.6</dep></entry>
-					<entry><ind> 15000</ind><dep> 8.3</dep></entry>
-					<entry><ind> 16000</ind><dep> 8.0</dep></entry>
-					<entry><ind> 17000</ind><dep> 7.6</dep></entry>
-					<entry><ind> 18000</ind><dep> 7.3</dep></entry>
-					<entry><ind> 19000</ind><dep> 7.0</dep></entry>
-					<entry><ind> 20000</ind><dep> 6.8</dep></entry>
-					<entry><ind> 22000</ind><dep> 6.2</dep></entry>
-					<entry><ind> 24000</ind><dep> 5.7</dep></entry>
-					<entry><ind> 26000</ind><dep> 5.2</dep></entry>
-					<entry><ind> 28000</ind><dep> 4.7</dep></entry>
-                    <entry><ind> 30000</ind><dep> 4.4</dep></entry>
-					<entry><ind> 32000</ind><dep> 4.0</dep></entry>
-					<entry><ind> 34000</ind><dep> 3.6</dep></entry>
-					<entry><ind> 36000</ind><dep> 3.3</dep></entry>
-					<entry><ind> 38000</ind><dep> 3.0</dep></entry>
-					<entry><ind> 39000</ind><dep> 2.9</dep></entry>
-					<entry><ind> 40000</ind><dep> 2.7</dep></entry>
-					<entry><ind> 41000</ind><dep> 2.6</dep></entry>
+					<entry><ind>10000</ind><dep> 10.1</dep></entry>
+					<entry><ind>11000</ind><dep>  9.7</dep></entry>
+					<entry><ind>12000</ind><dep>  9.3</dep></entry>
+					<entry><ind>13000</ind><dep>  9.0</dep></entry>
+					<entry><ind>14000</ind><dep>  8.6</dep></entry>
+					<entry><ind>15000</ind><dep>  8.3</dep></entry>
+					<entry><ind>16000</ind><dep>  8.0</dep></entry>
+					<entry><ind>17000</ind><dep>  7.6</dep></entry>
+					<entry><ind>18000</ind><dep>  7.3</dep></entry>
+					<entry><ind>19000</ind><dep>  7.0</dep></entry>
+					<entry><ind>20000</ind><dep>  6.8</dep></entry>
+					<entry><ind>22000</ind><dep>  6.2</dep></entry>
+					<entry><ind>24000</ind><dep>  5.7</dep></entry>
+					<entry><ind>26000</ind><dep>  5.2</dep></entry>
+					<entry><ind>28000</ind><dep>  4.7</dep></entry>
+                    <entry><ind>30000</ind><dep>  4.4</dep></entry>
+					<entry><ind>32000</ind><dep>  4.0</dep></entry>
+					<entry><ind>34000</ind><dep>  3.6</dep></entry>
+					<entry><ind>36000</ind><dep>  3.3</dep></entry>
+					<entry><ind>38000</ind><dep>  3.0</dep></entry>
+					<entry><ind>39000</ind><dep>  2.9</dep></entry>
+					<entry><ind>40000</ind><dep>  2.7</dep></entry>
+					<entry><ind>41000</ind><dep>  2.6</dep></entry>
+					<entry><ind>42000</ind><dep>  2.5</dep></entry>
 				</table>
 			</expression>
 		</input>