diff --git a/A320-main.xml b/A320-main.xml
index a1b90257..b04a5a41 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -231,6 +231,7 @@
 			<oh-btn type="bool">0</oh-btn>
 			<switch1 type="bool">0</switch1>
 			<flaps-click type="bool">0</flaps-click>
+			<pushbutton type="bool">0</pushbutton>
 			<spdbrk-click type="bool">0</spdbrk-click>
 			<relay-batt-1 type="bool">0</relay-batt-1>
 			<relay-batt-2 type="bool">0</relay-batt-2>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index deda8eb1..61e65c7a 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -11,8 +11,6 @@
 	<!-- No button lights without power! -->
 	<animation>
 		<type>select</type>
-		<object-name>ACESSFeedBtn1F</object-name>
-		<object-name>ACESSFeedBtn2A</object-name>
 		<object-name>ACPack1Btn1F</object-name>
 		<object-name>ACPack1Btn2O</object-name>
 		<object-name>ACPack2Btn1F</object-name>
@@ -95,6 +93,8 @@
 
 	<animation>
 		<type>select</type>
+		<object-name>ACESSFeedBtn1F</object-name>
+		<object-name>ACESSFeedBtn2A</object-name>
 		<object-name>AftCargoIsoBtn1F</object-name>
 		<object-name>AftCargoIsoBtn2O</object-name>
 		<object-name>AftCargoSmkBtn1S</object-name>
@@ -355,7 +355,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<mod-up>
 				<binding>
@@ -416,7 +416,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -464,7 +464,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -872,7 +872,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -934,7 +934,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -996,7 +996,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1230,7 +1230,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1297,7 +1297,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1364,7 +1364,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1431,7 +1431,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1498,7 +1498,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1565,7 +1565,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1632,7 +1632,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1700,7 +1700,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1767,7 +1767,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1833,7 +1833,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1876,7 +1876,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1919,7 +1919,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -1964,7 +1964,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2040,7 +2040,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
@@ -2126,7 +2126,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2193,7 +2193,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2260,7 +2260,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2327,7 +2327,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2395,7 +2395,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2454,7 +2454,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2519,7 +2519,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2584,7 +2584,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2648,7 +2648,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2713,7 +2713,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2778,7 +2778,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2843,7 +2843,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2909,7 +2909,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -2970,7 +2970,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3037,7 +3037,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3134,9 +3134,13 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<and>
+					<and>	
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
+							<property>/engines/engine[0]/n2-actual</property>
+							<value>14.0</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-bat</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -3210,23 +3214,14 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<or>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-bat</property>
-							<value>25</value>
-						</greater-than-equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
-					</or>
+					<property>/systems/electrical/sources/idg-1/gcu-1-powered</property>
 				</condition>
 				<command>property-toggle</command>
 				<property>controls/electrical/switches/gen-1</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3278,12 +3273,12 @@
 				<condition>
 					<or>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-bat</property>
-							<value>25</value>
+							<property>systems/electrical/bus/ac-1</property>
+							<value>110</value>
 						</greater-than-equals>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
+							<property>systems/electrical/bus/ac-2</property>
+							<value>110</value>
 						</greater-than-equals>
 					</or>
 				</condition>
@@ -3292,7 +3287,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3343,17 +3338,14 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-bat</property>
-						<value>25</value>
-					</greater-than-equals> <!-- control is on DC BAT bus 301PP via 11 PB - so if you enter EMER ELEC with it turned off, too bad -->
+					<property>/systems/electrical/sources/apu/gcu-powered</property>
 				</condition>
 				<command>property-toggle</command>
 				<property>controls/electrical/switches/apu</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3424,7 +3416,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3468,7 +3460,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3532,23 +3524,14 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<or>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-bat</property>
-							<value>25</value>
-						</greater-than-equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
-					</or>
+					<property>/systems/electrical/sources/idg-2/gcu-2-powered</property>
 				</condition>
 				<command>property-toggle</command>
 				<property>controls/electrical/switches/gen-2</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -3635,7 +3618,11 @@
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
+							<property>/engines/engine[1]/n2-actual</property>
+							<value>14.0</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-bat</property>
 							<value>25</value>
 						</greater-than-equals>
 						<equals>
@@ -3725,7 +3712,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<mod-up>
 				<binding>
@@ -3887,7 +3874,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
@@ -4248,7 +4235,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4312,7 +4299,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4385,7 +4372,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4458,7 +4445,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4524,7 +4511,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4597,7 +4584,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4671,7 +4658,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
@@ -4862,7 +4849,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -4939,7 +4926,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
@@ -5448,7 +5435,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5509,7 +5496,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5570,7 +5557,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5635,7 +5622,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5678,7 +5665,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5729,7 +5716,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5793,7 +5780,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -5865,7 +5852,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
@@ -5970,7 +5957,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
@@ -7355,7 +7342,7 @@
 			</mod-up>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -7401,7 +7388,7 @@
 			</mod-up>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -7521,7 +7508,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -7562,7 +7549,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -7614,7 +7601,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 			<binding>
 				<condition>
diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index 8fb64484..fa2021b5 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -68,7 +68,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
@@ -169,7 +169,7 @@
 					</equals>
 				</condition>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml
index bb56c86e..655894f7 100644
--- a/Models/Instruments/OHpanel/SteepAppr.xml
+++ b/Models/Instruments/OHpanel/SteepAppr.xml
@@ -53,7 +53,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-btn", 1);</script>
+				<script>libraries.pushbutton();</script>
 			</binding>
 		</action>
 	</animation>
diff --git a/Nasal/ECAM/ECAM-controller.nas b/Nasal/ECAM/ECAM-controller.nas
index 09832bdd..e39d7afb 100644
--- a/Nasal/ECAM/ECAM-controller.nas
+++ b/Nasal/ECAM/ECAM-controller.nas
@@ -90,8 +90,14 @@ var warningNodes = {
 		navTerrFault: props.globals.initNode("/ECAM/warnings/timer/nav-gpws-terr-fault"),
 	},
 	Flipflops: {
+		apuGenFault: props.globals.initNode("/ECAM/warnings/flipflop/apu-gen-fault"),
+		apuGenFaultOnOff: props.globals.initNode("/ECAM/warnings/flipflop/apu-gen-fault-on-off"),
 		bleed1LowTemp: props.globals.initNode("/ECAM/warnings/logic/bleed-1-low-temp-flipflop-output"),
 		bleed2LowTemp: props.globals.initNode("/ECAM/warnings/logic/bleed-2-low-temp-flipflop-output"),
+		gen1Fault: props.globals.initNode("/ECAM/warnings/flipflop/gen-1-fault"),
+		gen2Fault: props.globals.initNode("/ECAM/warnings/flipflop/gen-2-fault"),
+		gen1FaultOnOff: props.globals.initNode("/ECAM/warnings/flipflop/gen-1-fault-on-off"),
+		gen2FaultOnOff: props.globals.initNode("/ECAM/warnings/flipflop/gen-2-fault-on-off"),
 		pack1Ovht: props.globals.initNode("/ECAM/warnings/flipflop/pack-1-ovht"),
 		pack2Ovht: props.globals.initNode("/ECAM/warnings/flipflop/pack-2-ovht"),
 	},
diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 1993baa4..fe11ceee 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -1139,6 +1139,72 @@ var messages_priority_2 = func {
 		ECAM_controller.warningReset(acBusEssShedAtc);
 	}
 	
+	if (gen1fault.clearFlag == 0 and warningNodes.Flipflops.gen1Fault.getValue() and (phaseVar2 == 2 or phaseVar2 == 3 or phaseVar2 == 6 or phaseVar2 == 9)) {
+		gen1fault.active = 1;
+		if (!warningNodes.Flipflops.gen1FaultOnOff.getValue()) {
+			gen1faultGen.active = 1;
+		} else {
+			ECAM_controller.warningReset(gen1faultGen);
+		}
+		
+		if (systems.ELEC.Switch.gen1.getBoolValue()) {
+			gen1faultGen2.active = 1;
+			gen1faultGen3.active = 1;
+		} else {
+			ECAM_controller.warningReset(gen1faultGen2);
+			ECAM_controller.warningReset(gen1faultGen3);
+		}
+	} else {
+		ECAM_controller.warningReset(gen1fault);
+		ECAM_controller.warningReset(gen1faultGen);
+		ECAM_controller.warningReset(gen1faultGen2);
+		ECAM_controller.warningReset(gen1faultGen3);
+	}
+	
+	if (gen2fault.clearFlag == 0 and warningNodes.Flipflops.gen2Fault.getValue() and (phaseVar2 == 2 or phaseVar2 == 3 or phaseVar2 == 6 or phaseVar2 == 9)) {
+		gen2fault.active = 1;
+		if (!warningNodes.Flipflops.gen2FaultOnOff.getValue()) {
+			gen2faultGen.active = 1;
+		} else {
+			ECAM_controller.warningReset(gen2faultGen);
+		}
+		
+		if (systems.ELEC.Switch.gen2.getBoolValue()) {
+			gen2faultGen2.active = 1;
+			gen2faultGen3.active = 1;
+		} else {
+			ECAM_controller.warningReset(gen2faultGen2);
+			ECAM_controller.warningReset(gen2faultGen3);
+		}
+	} else {
+		ECAM_controller.warningReset(gen2fault);
+		ECAM_controller.warningReset(gen2faultGen);
+		ECAM_controller.warningReset(gen2faultGen2);
+		ECAM_controller.warningReset(gen2faultGen3);
+	}
+	
+	if (apuGenfault.clearFlag == 0 and warningNodes.Flipflops.apuGenFault.getValue() and (phaseVar2 <= 3 or phaseVar2 == 6 or phaseVar2 >= 9)) {
+		apuGenfault.active = 1;
+		if (!warningNodes.Flipflops.apuGenFaultOnOff.getValue()) {
+			apuGenfaultGen.active = 1;
+		} else {
+			ECAM_controller.warningReset(apuGenfaultGen);
+		}
+		
+		if (systems.ELEC.Switch.genApu.getBoolValue()) {
+			apuGenfaultGen2.active = 1;
+			apuGenfaultGen3.active = 1;
+		} else {
+			ECAM_controller.warningReset(apuGenfaultGen2);
+			ECAM_controller.warningReset(apuGenfaultGen3);
+		}
+	} else {
+		ECAM_controller.warningReset(apuGenfault);
+		ECAM_controller.warningReset(apuGenfaultGen);
+		ECAM_controller.warningReset(apuGenfaultGen2);
+		ECAM_controller.warningReset(apuGenfaultGen3);
+	}
+	
 	if ((athr_offw.clearFlag == 0) and athrWarn.getValue() == 2 and phaseVar2 != 4 and phaseVar2 != 8 and phaseVar2 != 10) {
 		athr_offw.active = 1;
 		athr_offw_1.active = 1;
diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas
index 1e0cc66b..7d6e0462 100644
--- a/Nasal/ECAM/ECAM-messages.nas
+++ b/Nasal/ECAM/ECAM-messages.nas
@@ -212,9 +212,27 @@ var warnings				  = std.Vector.new([
 	var dcBusEssShedIcing     = warning.new(msg: " AVOID ICING CONDITIONS",   colour: "c"),
 	
 	# AC ESS BUS SHED
-	var acBusEssShed          = warning.new(msg: "ELEC DC ESS BUS SHED",      colour: "a", aural: 1, light: 1, isMainMsg: 1),
+	var acBusEssShed          = warning.new(msg: "ELEC AC ESS BUS SHED",      colour: "a", aural: 1, light: 1, isMainMsg: 1),
 	var acBusEssShedAtc       = warning.new(msg: " -ATC..............SYS 2",  colour: "c"),
 	
+	# GEN 1 FAULT
+	var gen1fault             = warning.new(msg: "ELEC GEN 1 FAULT",          colour: "a", aural: 1, light: 1, isMainMsg: 1),
+	var gen1faultGen          = warning.new(msg: "-GEN 1......OFF THEN ON",   colour: "c"),
+	var gen1faultGen2         = warning.new(msg: "   •IF UNSUCCESSFUL :",     colour: "w"),
+	var gen1faultGen3         = warning.new(msg: "-GEN 1..............OFF",   colour: "c"),
+	
+	# GEN 2 FAULT
+	var gen2fault             = warning.new(msg: "ELEC GEN 2 FAULT",          colour: "a", aural: 1, light: 1, isMainMsg: 1),
+	var gen2faultGen          = warning.new(msg: "-GEN 2......OFF THEN ON",   colour: "c"),
+	var gen2faultGen2         = warning.new(msg: "   •IF UNSUCCESSFUL :",     colour: "w"),
+	var gen2faultGen3         = warning.new(msg: "-GEN 2..............OFF",   colour: "c"),
+	
+	# APU GEN FAULT
+	var apuGenfault             = warning.new(msg: "ELEC APU GEN FAULT",      colour: "a", aural: 1, light: 1, isMainMsg: 1),
+	var apuGenfaultGen          = warning.new(msg: "-APU GEN....OFF THEN ON", colour: "c"),
+	var apuGenfaultGen2         = warning.new(msg: "   •IF UNSUCCESSFUL :", colour: "w"),
+	var apuGenfaultGen3         = warning.new(msg: "-APU GEN............OFF", colour: "c"),
+	
 	# Autothrust
 	var athr_offw			  = warning.new(msg: "AUTO FLT A/THR OFF", 	      colour: "a", aural: 1, light: 1, isMainMsg: 1),
 	var athr_offw_1			  = warning.new(msg: "-THR LEVERS........MOVE",   colour: "c"),
diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas
index f5ade43d..edbc2a09 100644
--- a/Nasal/Libraries/buttons.nas
+++ b/Nasal/Libraries/buttons.nas
@@ -150,3 +150,9 @@ var toggleSTD = func {
 		pts.Instrumentation.Altimeter.std.setBoolValue(1);
 	}
 }
+
+var pushbuttonSound = props.globals.getNode("/sim/sounde/pushbutton");
+var pushbutton = func {
+	pushbuttonSound.setValue(1);
+  settimer(func {pushbuttonSound.setValue(0);},0.20);
+}
\ No newline at end of file
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index a597a1c9..8cf22fe4 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -7,7 +7,6 @@ print("------------------------------------------------");
 print("Copyright (c) 2016-2020 Josh Davidson (Octal450)");
 print("------------------------------------------------");
 
-
 setprop("/sim/menubar/default/menu[0]/item[0]/enabled", 0);
 setprop("/sim/menubar/default/menu[2]/item[0]/enabled", 0);
 setprop("/sim/menubar/default/menu[2]/item[2]/enabled", 0);
diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas
index 4e295ea7..1ff311e2 100644
--- a/Nasal/Systems/electrical.nas
+++ b/Nasal/Systems/electrical.nas
@@ -120,10 +120,10 @@ var ELEC = {
 		EmerGen: {
 			volts: props.globals.getNode("/systems/electrical/sources/emer-gen/output-volt"),
 			hertz: props.globals.getNode("/systems/electrical/sources/emer-gen/output-hertz"),
+			voltsRelay: props.globals.getNode("/systems/electrical/relay/emer-glc/output"),
 		},
 		Ext: {
 			volts: props.globals.getNode("/systems/electrical/sources/ext/output-volt"),
-			voltsRelay: props.globals.getNode("/systems/electrical/relay/emer-glc/output"),
 			hertz: props.globals.getNode("/systems/electrical/sources/ext/output-hertz"),
 		},
 		tr1: {
@@ -153,9 +153,9 @@ var ELEC = {
 	},
 	Switch: {
 		acEssFeed: props.globals.getNode("/controls/electrical/switches/ac-ess-feed"),
-		busTie: props.globals.getNode("/controls/electrical/switches/bus-tie"),
 		bat1: props.globals.getNode("/controls/electrical/switches/bat-1"),
 		bat2: props.globals.getNode("/controls/electrical/switches/bat-2"),
+		busTie: props.globals.getNode("/controls/electrical/switches/bus-tie"),
 		emerGenTest: props.globals.getNode("/controls/electrical/switches/emer-gen-test"),
 		extPwr: props.globals.getNode("/controls/electrical/switches/ext-pwr"),
 		galley: props.globals.getNode("/controls/electrical/switches/galley"),
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index df99d463..e93408c2 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -1528,6 +1528,20 @@
 			</volume>
 		</switch>
 		
+		<switch>
+            <name>Pushbutton</name>
+            <mode>once</mode>
+            <type>avionics</type>
+            <path>Aircraft/A320-family/Sounds/Cockpit/pushbutton.wav</path>
+            <condition>
+				<property>/sim/sounde/pushbutton</property>
+            </condition>
+            <volume>
+                <property>sim/current-view/internal</property>
+				<factor>0.25</factor>
+            </volume>
+        </switch>
+		
 		<switch>
 			<name>Flaps Lever</name>
 			<mode>once</mode>
diff --git a/Sounds/Cockpit/pushbutton.wav b/Sounds/Cockpit/pushbutton.wav
new file mode 100644
index 00000000..f935763e
Binary files /dev/null and b/Sounds/Cockpit/pushbutton.wav differ
diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index 85687401..3cd7cffb 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -5,6 +5,8 @@
 <system name="A320: Electrical">	
 	
 	<property value="0">/systems/electrical/some-electric-thingie/rat-deploy</property>
+	<property value="0">/systems/electrical/relay/gen-1-glc/contact-pos</property>
+	<property value="0">/systems/electrical/relay/gen-2-glc/contact-pos</property>
 	
 	<channel name="Main Electrical" execrate="8">
 		
@@ -361,7 +363,6 @@
 		<switch name="/systems/electrical/sources/idg-1/working">
 			<default value="1"/>
 			<test logic="OR" value="0">
-				/controls/engines/engine[0]/fire-btn eq 1
 				/systems/failures/electrical/idg-1 eq 1
 				/controls/electrical/switches/idg-1-disc eq 0
 			</test>
@@ -380,8 +381,8 @@
 				</quotient>
 			</function>
 			<clipto>
-				<min>1.3</min>
-				<max>2.8</max>
+				<min>1.315</min>
+				<max>2.667</max>
 			</clipto>
 		</fcs_function>
 		
@@ -423,7 +424,8 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/systems/failures/electrical/gen-1 ne 1
-				/systems/electrical/sources/idg-1/csd-rpm ge 11500
+				/controls/engines/engine[0]/fire-btn eq 0
+				/systems/electrical/sources/idg-1/drive-rpm ge 4730
 			</test>
 		</switch>
 		
@@ -446,7 +448,6 @@
 		<switch name="/systems/electrical/sources/idg-2/working">
 			<default value="1"/>
 			<test logic="OR" value="0">
-				/controls/engines/engine[1]/fire-btn eq 1
 				/systems/failures/electrical/idg-2 eq 1
 				/controls/electrical/switches/idg-2-disc eq 0
 			</test>
@@ -465,8 +466,8 @@
 				</quotient>
 			</function>
 			<clipto>
-				<min>1.3</min>
-				<max>2.8</max>
+				<min>1.315</min>
+				<max>2.667</max>
 			</clipto>
 		</fcs_function>
 		
@@ -508,7 +509,8 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/systems/failures/electrical/gen-2 ne 1
-				/systems/electrical/sources/idg-2/csd-rpm ge 11500
+				/controls/engines/engine[1]/fire-btn eq 0
+				/systems/electrical/sources/idg-2/drive-rpm ge 4730
 			</test>
 		</switch>
 		
@@ -523,27 +525,15 @@
 		</pure_gain>
 		
 		<!-- APU gen -->
-		<pure_gain name="/systems/electrical/sources/apu/drive-rpm-input">
+		<pure_gain name="/systems/electrical/sources/apu/drive-rpm">
 			<input>/engines/engine[2]/n1</input>
 			<gain>240.34</gain>
 		</pure_gain>
 		
-		<switch name="/systems/electrical/sources/apu/working">
-			<default value="1"/>
-			<test logic="OR" value="0">
-				/controls/apu/fire-btn eq 1
-			</test>
-		</switch>
-		
-		<pure_gain name="/systems/electrical/sources/apu/drive-rpm">
-			<input>/systems/electrical/sources/apu/drive-rpm-input</input>
-			<gain>/systems/electrical/sources/apu/working</gain>
-		</pure_gain>
-		
 		<fcs_function name="/systems/electrical/sources/apu/pmg-volt">
 			<function>
 				<product>
-					<property>/systems/electrical/sources/apu/drive-rpm-input</property>
+					<property>/systems/electrical/sources/apu/drive-rpm</property>
 					<quotient>
 						<value>115</value>
 						<value>24000</value>
@@ -556,7 +546,7 @@
 			<function>
 				<quotient>
 					<product>
-						<property>/systems/electrical/sources/apu/drive-rpm-input</property>
+						<property>/systems/electrical/sources/apu/drive-rpm</property>
 						<value>2</value> <!-- Number of poles in generator -->
 					</product>
 					<value>120</value>
@@ -567,9 +557,10 @@
 		<switch name="/systems/electrical/sources/apu/gcr-relay">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/controls/apu/fire-btn ne 1
 				/controls/electrical/switches/apu eq 1
 				/systems/failures/electrical/apu ne 1
-				/systems/electrical/sources/apu/drive-rpm-input ge 23000
+				/systems/electrical/sources/apu/drive-rpm ge 22800
 			</test>
 		</switch>
 		
@@ -656,6 +647,15 @@
 			<gain>/systems/electrical/sources/si-1/inverter-gain</gain>
 		</pure_gain>
 		
+		<switch name="/systems/electrical/sources/si-1/fault">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/sources/bat-1/volt lt 23.5
+				/systems/electrical/sources/si-1/output-volt lt 110
+				/systems/electrical/sources/si-1/output-volt ge 120
+			</test>
+		</switch>
+		
 		<switch name="/systems/electrical/sources/si-1/output-hertz">
 			<default value="0"/>
 			<test logic="AND" value="400">
@@ -761,15 +761,69 @@
 		</switch>
 		
 		<!-- Source Relays -->
-		<switch name="/systems/electrical/relay/gen-1-glc/contact-pos">
+		<switch name="/systems/electrical/sources/idg-1/gcu-1-powered">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/bus/dc-bat ge 25
+				/systems/electrical/sources/idg-1/pmg-volt ge 110
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/idg-1/gcu-1-voltage-trip">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/systems/electrical/sources/idg-1/gcu-1-voltage-trip eq 1
 				/controls/electrical/switches/gen-1 eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/electrical/relay/gen-1-glc/contact-pos eq 1
+				<test logic="OR">
+					/systems/electrical/sources/idg-1/output-volt lt 110
+					/systems/electrical/sources/idg-1/output-volt gt 130
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/idg-1/gcu-1-frequency-trip">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/sources/idg-1/gcu-1-frequency-trip eq 1
+				/controls/electrical/switches/gen-1 eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/electrical/relay/gen-1-glc/contact-pos eq 1
+				<test logic="OR">
+					/systems/electrical/sources/idg-1/output-hertz lt 363
+					/systems/electrical/sources/idg-1/output-hertz gt 433
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/idg-1/gcu-1-fault">
+			<default value="0"/>
+			<test logic="OR" value="0">
+				/systems/acconfig/autoconfig-running eq 1
+				/sim/time/elapsed-sec lt 10
+			</test>
+			<test logic="OR" value="1">
+				/systems/electrical/sources/idg-1/gcu-1-voltage-trip eq 1
+				/systems/electrical/sources/idg-1/gcu-1-frequency-trip eq 1
+				/systems/electrical/sources/idg-1/drive-rpm lt 4730
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/relay/gen-1-glc/contact-pos">
+			<default value="0"/>
+			<test logic="OR" value="0">
+				/sim/time/elapsed-sec lt 10
+			</test>	
+			<test logic="AND" value="1">
+				/controls/electrical/switches/gen-1 eq 1
+				/systems/electrical/sources/idg-1/output-hertz ge 363
+				/systems/electrical/sources/idg-1/output-hertz le 433
 				/systems/electrical/sources/idg-1/output-volt ge 110
 				/systems/electrical/sources/idg-1/output-volt le 130
-				/systems/electrical/sources/idg-1/output-hertz ge 390
-				/systems/electrical/sources/idg-1/output-hertz le 410
-				/controls/electrical/switches/gen-1-line-contactor ne 1
+				/systems/electrical/sources/idg-1/gcu-1-fault ne 1 <!-- software trip -->
 			</test>
 		</switch>
 		
@@ -780,14 +834,69 @@
 			</test>
 		</switch>
 		
-		<switch name="/systems/electrical/relay/gen-2-glc/contact-pos">
+		<switch name="/systems/electrical/sources/idg-2/gcu-2-powered">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/bus/dc-bat ge 25
+				/systems/electrical/sources/idg-2/pmg-volt ge 110
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/idg-2/gcu-2-voltage-trip">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/systems/electrical/sources/idg-2/gcu-2-voltage-trip eq 1
 				/controls/electrical/switches/gen-2 eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/electrical/relay/gen-2-glc/contact-pos eq 1
+				<test logic="OR">
+					/systems/electrical/sources/idg-2/output-volt lt 110
+					/systems/electrical/sources/idg-2/output-volt gt 130
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/idg-2/gcu-2-frequency-trip">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/sources/idg-2/gcu-2-frequency-trip eq 1
+				/controls/electrical/switches/gen-2 eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/electrical/relay/gen-2-glc/contact-pos eq 1
+				<test logic="OR">
+					/systems/electrical/sources/idg-2/output-hertz lt 363
+					/systems/electrical/sources/idg-2/output-hertz gt 433
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/idg-2/gcu-2-fault">
+			<default value="0"/>
+			<test logic="OR" value="0">
+				/systems/acconfig/autoconfig-running eq 1
+				/sim/time/elapsed-sec lt 10
+			</test>
+			<test logic="OR" value="1">
+				/systems/electrical/sources/idg-2/gcu-2-voltage-trip eq 1
+				/systems/electrical/sources/idg-2/gcu-2-frequency-trip eq 1
+				/systems/electrical/sources/idg-2/drive-rpm lt 4730
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/relay/gen-2-glc/contact-pos">
+			<default value="0"/>
+			<test logic="OR" value="0">
+				/sim/time/elapsed-sec lt 10
+			</test>	
+			<test logic="AND" value="1">
+				/controls/electrical/switches/gen-2 eq 1
+				/systems/electrical/sources/idg-2/output-hertz ge 363
+				/systems/electrical/sources/idg-2/output-hertz le 433
 				/systems/electrical/sources/idg-2/output-volt ge 110
-				/systems/electrical/sources/idg-2/output-volt lt 130
-				/systems/electrical/sources/idg-2/output-hertz ge 390
-				/systems/electrical/sources/idg-2/output-hertz le 410
+				/systems/electrical/sources/idg-2/output-volt le 130
+				/systems/electrical/sources/idg-2/gcu-2-fault ne 1 <!-- software trip -->
 			</test>
 		</switch>
 		
@@ -814,16 +923,70 @@
 			</test>
 		</switch>
 		
+		<switch name="/systems/electrical/sources/apu/gcu-powered">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/bus/dc-bat ge 25
+				/systems/electrical/sources/apu/pmg-volt ge 101.5
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/apu/gcu-voltage-trip">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/sources/apu/gcu-voltage-trip eq 1
+				/controls/electrical/switches/apu eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/electrical/relay/apu-glc/contact-pos eq 1
+				<test logic="OR">
+					/systems/electrical/sources/apu/output-volt lt 101.5
+					/systems/electrical/sources/apu/output-volt gt 130
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/apu/gcu-frequency-trip">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/electrical/sources/apu/gcu-frequency-trip eq 1
+				/controls/electrical/switches/apu eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/electrical/relay/apu-glc/contact-pos eq 1
+				<test logic="OR">
+					/systems/electrical/sources/apu/output-hertz lt 361
+					/systems/electrical/sources/apu/output-hertz gt 435
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/electrical/sources/apu/gcu-fault">
+			<default value="0"/>
+			<test logic="OR" value="0">
+				/systems/acconfig/autoconfig-running eq 1
+				/sim/time/elapsed-sec lt 10
+			</test>
+			<test logic="OR" value="1">
+				/systems/electrical/sources/apu/gcu-voltage-trip eq 1
+				/systems/electrical/sources/apu/gcu-frequency-trip eq 1
+			</test>
+		</switch>
+		
 		<switch name="/systems/electrical/relay/apu-glc/contact-pos">
 			<default value="0"/>
+			<test logic="OR" value="0">
+				/sim/time/elapsed-sec lt 10
+			</test>	
 			<test logic="AND" value="1">
 				/controls/apu/master eq 1
 				/controls/electrical/switches/apu eq 1
-				/systems/electrical/sources/apu/output-volt ge 110
-				/systems/electrical/sources/apu/output-volt lt 130
-				/systems/electrical/sources/apu/output-hertz ge 390
-				/systems/electrical/sources/apu/output-hertz le 410
+				/systems/electrical/sources/apu/output-volt ge 101.5
+				/systems/electrical/sources/apu/output-volt le 130
+				/systems/electrical/sources/apu/output-hertz ge 361
+				/systems/electrical/sources/apu/output-hertz le 435
 				/systems/electrical/relay/ext-epc/contact-pos eq 0
+				/systems/electrical/sources/apu/gcu-fault ne 1 <!-- software trip -->
 			</test>
 		</switch>
 		
@@ -907,10 +1070,24 @@
 		</switch>
 		
 		<!-- AC ESS Relays -->
+		<switch name="/systems/electrical/relay/ac-ess-feed-1/auto-switch">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/bus/ac-1 lt 110
+			</test>
+		</switch>
+		
+		<actuator name="/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer">
+			<input>/systems/electrical/relay/ac-ess-feed-1/auto-switch</input>
+			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="incr">0.33333333333</rate_limit> <!-- 3 seconds -->
+		</actuator>
+		
 		<switch name="/systems/electrical/relay/ac-ess-feed-1/contact-pos"> <!-- TODO: via 1XC CB on 123VU -->
 			<default value="0"/>
 			<test logic="AND" value="1"> <!-- old AC ESS FEED supply mode -->
 				/controls/electrical/switches/ac-ess-feed eq 0
+				/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer lt 1
 				/controls/electrical/switches/emer-gen-test eq 0
 			</test>
 		</switch>
@@ -925,7 +1102,10 @@
 		<switch name="/systems/electrical/relay/ac-ess-feed-2/contact-pos"> <!-- TODO: via 2XC CB on 123VU -->
 			<default value="0"/>
 			<test logic="AND" value="1"> <!-- old AC ESS FEED supply mode -->
-				/controls/electrical/switches/ac-ess-feed eq 1
+				<test logic="OR">
+					/controls/electrical/switches/ac-ess-feed eq 1
+					/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer eq 1
+				</test>
 				/controls/electrical/switches/emer-gen-test eq 0
 			</test>
 		</switch>
@@ -1699,7 +1879,6 @@
 		</switch>
 		
 		<actuator name="/systems/electrical/some-electric-thingie/static-inverter-timer">
-            <description>Timer for the ECAM system</description>
             <input>/systems/electrical/relay/ac-ess-feed-inverter/contact-pos</input>
             <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
@@ -1750,11 +1929,16 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/controls/electrical/switches/apu eq 1
-				/systems/electrical/relay/apu-glc/contact-pos eq 0
-				/systems/electrical/relay/ext-epc/contact-pos eq 0
-				/systems/electrical/relay/gen-1-glc/contact-pos eq 0
-				/systems/electrical/relay/gen-2-glc/contact-pos eq 0
-				/systems/electrical/sources/apu/drive-rpm gt 2000
+				<test logic="OR">
+					/systems/electrical/sources/apu/gcu-fault eq 1
+					<test logic="AND">
+						/systems/electrical/relay/apu-glc/contact-pos eq 0
+						/systems/electrical/relay/ext-epc/contact-pos eq 0
+						/systems/electrical/relay/gen-1-glc/contact-pos eq 0
+						/systems/electrical/relay/gen-2-glc/contact-pos eq 0
+					</test>
+				</test>
+				/systems/electrical/sources/apu/drive-rpm gt 22800
 			</test>
 		</switch>
 		
@@ -1781,7 +1965,10 @@
 			<default value="0"/>
 			<test value="1">
 				/controls/electrical/switches/gen-1 eq 1
-				/systems/electrical/relay/gen-1-glc/contact-pos eq 0
+				<test logic="OR">
+					/systems/electrical/sources/idg-1/gcu-1-fault eq 1
+					/systems/electrical/relay/gen-1-glc/contact-pos eq 0
+				</test>
 			</test>
 		</switch>
 		
@@ -1789,7 +1976,10 @@
 			<default value="0"/>
 			<test value="1">
 				/controls/electrical/switches/gen-2 eq 1
-				/systems/electrical/relay/gen-2-glc/contact-pos eq 0
+				<test logic="OR">
+					/systems/electrical/sources/idg-2/gcu-2-fault eq 1
+					/systems/electrical/relay/gen-2-glc/contact-pos eq 0
+				</test>
 			</test>
 		</switch>
 		
@@ -1797,7 +1987,7 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/systems/failures/electrical/idg-1 eq 1
-				/systems/electrical/sources/idg-1/csd-rpm gt 2000
+				/systems/electrical/sources/idg-1/drive-rpm gt 2000
 			</test>
 			<test logic="AND" value="1">
 				/controls/electrical/switches/idg-1-disc-momentary eq 1
@@ -1808,7 +1998,7 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/systems/failures/electrical/idg-2 eq 1
-				/systems/electrical/sources/idg-2/csd-rpm gt 2000
+				/systems/electrical/sources/idg-2/drive-rpm gt 2000
 			</test>
 			<test logic="AND" value="1">
 				/controls/electrical/switches/idg-2-disc-momentary eq 1
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index 89a79a4b..da23cdd9 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -342,6 +342,34 @@
             <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">1.0</rate_limit> <!-- 1 second -->
 		</actuator>
+		
+		<actuator name="/ECAM/warnings/timer/gen-1-fault-set">
+			<description>Timer for the ECAM system</description>
+			<input>/ECAM/warnings/logic/gen-1-fault-set</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.1818</rate_limit> <!-- 5.5 seconds -->
+		</actuator>
+		
+		<actuator name="/ECAM/warnings/timer/gen-2-fault-set">
+			<description>Timer for the ECAM system</description>
+			<input>/ECAM/warnings/logic/gen-2-fault-set</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.1818</rate_limit> <!-- 5.5 seconds -->
+		</actuator>
+		
+		<actuator name="/ECAM/warnings/timer/apu-gen-fault-set">
+			<description>Timer for the ECAM system</description>
+			<input>/ECAM/warnings/logic/apu-gen-fault-set</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
+		</actuator>
+		
+		<actuator name="/ECAM/warnings/timer/apu-gen-fault-reset">
+			<description>Timer for the ECAM system</description>
+			<input>/ECAM/warnings/logic/apu-gen-fault-reset</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
+		</actuator>
 	</channel>
 	
 	<channel name="ECAM" execrate="8">
@@ -1459,5 +1487,179 @@
 			</test>
 		</switch>
 	</channel>
+	
+	<channel name="Electrical Warnings" execrate="8">
+	
+		<switch name="/ECAM/warnings/logic/gen-1-inop">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/engines/engine[0]/state eq 3
+				/systems/electrical/relay/gen-1-glc/contact-pos eq 0
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-1-fault-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/controls/electrical/switches/gen-1 eq 1
+				/controls/electrical/switches/idg-1-disc eq 1
+				/ECAM/warnings/logic/gen-1-inop eq 1
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-1-fault-set-output">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/ECAM/warnings/timer/gen-1-fault-set eq 1
+			</test>
+		</switch>
+		
+		<actuator name="/ECAM/warnings/logic/glc-1-online-2-sec">
+			<input>/systems/electrical/relay/gen-1-glc/contact-pos</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
+		</actuator>
+		
+		<switch name="/ECAM/warnings/logic/gen-1-fault-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 10
+				/systems/electrical/some-electric-thingie/emer-elec-config eq 1
+				/ECAM/warnings/logic/glc-1-online-2-sec eq 1
+				<!-- todo smoke + gen line pb -->
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-1-fault-on-off-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/ECAM/warnings/flipflop/gen-1-fault eq 1
+				<test logic="AND">
+					/ECAM/warnings/logic/gen-1-pulse eq 1
+					/controls/electrical/switches/gen-1 eq 1
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-1-fault-on-off-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warnings/flipflop/gen-1-fault eq 0
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 10
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-2-inop">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/engines/engine[1]/state eq 3
+				/systems/electrical/relay/gen-2-glc/contact-pos eq 0
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-2-fault-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/controls/electrical/switches/gen-2 eq 1
+				/controls/electrical/switches/idg-2-disc eq 1
+				/ECAM/warnings/logic/gen-2-inop eq 1
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-2-fault-set-output">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/ECAM/warnings/timer/gen-2-fault-set eq 1
+			</test>
+		</switch>
+		
+		<actuator name="/ECAM/warnings/logic/glc-2-online-2-sec">
+			<input>/systems/electrical/relay/gen-2-glc/contact-pos</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
+		</actuator>
+		
+		<switch name="/ECAM/warnings/logic/gen-2-fault-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 10
+				/systems/electrical/some-electric-thingie/emer-elec-config eq 1
+				/ECAM/warnings/logic/glc-2-online-2-sec eq 1
+				<!-- todo smoke + gen line pb -->
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-2-fault-on-off-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/ECAM/warnings/flipflop/gen-2-fault eq 1
+				<test logic="AND">
+					/ECAM/warnings/logic/gen-2-pulse eq 1
+					/controls/electrical/switches/gen-2 eq 1
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/gen-2-fault-on-off-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warnings/flipflop/gen-2-fault eq 0
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 10
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/apu-gen-fault">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/apu/available eq 1
+				/systems/electrical/sources/apu/gcu-fault eq 1
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/apu-gen-fault-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/controls/electrical/switches/apu eq 1
+				/ECAM/warnings/logic/apu-gen-fault eq 1
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/apu-gen-fault-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warning-phase eq 1
+				<test logic="AND">
+					/systems/apu/available eq 1
+					/controls/electrical/switches/apu eq 1
+					/systems/electrical/sources/apu/gcu-fault eq 0
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/apu-gen-fault-on-off-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/ECAM/warnings/flipflop/apu-gen-fault eq 1
+				<test logic="AND">
+					/ECAM/warnings/logic/apu-elec-gen-pulse eq 1
+					/controls/electrical/switches/apu eq 1
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/apu-gen-fault-on-off-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warnings/flipflop/apu-gen-fault eq 0
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 10
+			</test>
+		</switch>
+		
+	</channel>
 
 </system>
diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml
index e6545cf2..80d56c3b 100644
--- a/Systems/ecam-proprules.xml
+++ b/Systems/ecam-proprules.xml
@@ -558,6 +558,39 @@
         <output>/ECAM/warnings/logic/apu-bleed-sw-pulse</output>
     </flipflop>
 	
+	<flipflop>
+        <type>monostable</type>
+        <time>
+            <value>1.0</value>
+        </time>
+        <S>
+			<not><property>/controls/electrical/switches/apu</property></not>
+        </S>
+        <output>/ECAM/warnings/logic/apu-elec-gen-pulse</output>
+    </flipflop>
+	
+	<flipflop>
+        <type>monostable</type>
+        <time>
+            <value>1.0</value>
+        </time>
+        <S>
+			<not><property>/controls/electrical/switches/gen-1</property></not>
+        </S>
+        <output>/ECAM/warnings/logic/gen-1-pulse</output>
+    </flipflop>
+	
+	<flipflop>
+        <type>monostable</type>
+        <time>
+            <value>1.0</value>
+        </time>
+        <S>
+			<not><property>/controls/electrical/switches/gen-2</property></not>
+        </S>
+        <output>/ECAM/warnings/logic/gen-2-pulse</output>
+    </flipflop>
+	
 	<flipflop>
         <type>monostable</type>
         <time>
@@ -796,4 +829,70 @@
 		<output>/ECAM/warnings/flipflop/pack-2-off</output>
 	</flipflop>
 	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/gen-1-fault-set-output</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/gen-1-fault-reset</property>
+		</R>
+		<output>/ECAM/warnings/flipflop/gen-1-fault</output>
+	</flipflop>
+	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/gen-1-fault-on-off-set</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/gen-1-fault-on-off-reset</property>
+		</R>
+		<output>/ECAM/warnings/flipflop/gen-1-fault-on-off</output>
+	</flipflop>
+	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/gen-2-fault-set-output</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/gen-2-fault-reset</property>
+		</R>
+		<output>/ECAM/warnings/flipflop/gen-2-fault</output>
+	</flipflop>
+	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/gen-2-fault-on-off-set</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/gen-2-fault-on-off-reset</property>
+		</R>
+		<output>/ECAM/warnings/flipflop/gen-2-fault-on-off</output>
+	</flipflop>
+	
+	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/timer/apu-gen-fault-set</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/timer/apu-gen-fault-reset</property>
+		</R>
+		<output>/ECAM/warnings/flipflop/apu-gen-fault</output>
+	</flipflop>
+	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/apu-gen-fault-on-off-set</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/apu-gen-fault-on-off-reset</property>
+		</R>
+		<output>/ECAM/warnings/flipflop/apu-gen-fault-on-off</output>
+	</flipflop>
 </PropertyList>
diff --git a/revision.txt b/revision.txt
index 86ee83a4..aaa6442f 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-40
\ No newline at end of file
+41
\ No newline at end of file