diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 987914b4..4b9cb0da 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -3564,13 +3564,13 @@ var messages_right_memo = func {
 		wing_aice.active = 0;
 	}
 	
-	if (systems.PNEU.Switch.apu.getValue() == 1 and pts.APU.rpm.getValue() >= 95) {
+	if (systems.PNEU.Switch.apu.getValue() == 1 and systems.PNEU.Valves.apu.getValue() != 0 and systems.APUController.APU != nil and systems.APUController.APU.signals.available.getBoolValue()) {
 		apu_bleed.active = 1;
 	} else {
 		apu_bleed.active = 0;
 	}
 
-	if (apu_bleed.active == 0 and pts.APU.rpm.getValue() >= 95) {
+	if (apu_bleed.active == 0 and systems.APUController.APU != nil and systems.APUController.APU.signals.available.getBoolValue()) {
 		apu_avail.active = 1;
 	} else {
 		apu_avail.active = 0;
diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index 9b416c21..94aa069d 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -2153,7 +2153,7 @@
 	
 	<channel name="Emergency Electric Logic" execrate="8">
 		
-		<switch name="/systems/electrical/some-electric-thingie/emer-elec-config">
+		<switch name="/systems/electrical/some-electric-thingie/emer-elec-config-cmd">
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/systems/electrical/bus/ac-1 lt 110
@@ -2163,20 +2163,33 @@
 				/systems/electrical/relay/ext-epc/contact-pos eq 0
 				<test logic="OR">
 					/controls/electrical/switches/gen-1 eq 0
-					/systems/failures/electrical/gen-1 eq 1
+					/ECAM/warnings/logic/gen-1-inop eq 1
                 </test>
 				<test logic="OR">
 					/controls/electrical/switches/gen-2 eq 0
-					/systems/failures/electrical/gen-2 eq 1
+					/ECAM/warnings/logic/gen-2-inop eq 1
                 </test>
 				<test logic="OR">
 					/controls/electrical/switches/apu eq 0
-					/systems/failures/electrical/apu eq 1
-					/engines/engine[2]/n1 lt 94.9
+					/ECAM/warnings/logic/apu-gen-fault eq 1
+					/systems/apu/available eq 0
                 </test>
 			</test>
 		</switch>
 		
+		<actuator name="/systems/electrical/some-electric-thingie/emer-elec-config-timer">
+			<input>/systems/electrical/some-electric-thingie/emer-elec-config-cmd</input>
+			<rate_limit sense="incr">5</rate_limit>
+			<rate_limit sense="decr">100</rate_limit>
+		</actuator>
+		
+		<switch name="/systems/electrical/some-electric-thingie/emer-elec-config">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/some-electric-thingie/emer-elec-config-timer eq 1
+			</test>
+		</switch>
+		
 		<switch name="/systems/electrical/some-electric-thingie/emer-elec-config-generator-1-bustie">
 			<default value="0"/>
 			<test logic="AND" value="1">
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index a88998b0..a132a408 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -2822,7 +2822,7 @@
 			</test>
 		</switch>
 		
-		<switch name="/ECAM/warnings/logic/eng/dual-failure-5-sec-input">
+		<switch name="/ECAM/warnings/logic/eng/dual-failure-2-sec-input">
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/engines/engine[0]/n2-actual lt 59.4
@@ -2830,8 +2830,8 @@
 			</test>
 		</switch>
 		
-		<actuator name="/ECAM/warnings/logic/eng/dual-failure-5-sec">
-			<input>/ECAM/warnings/logic/eng/dual-failure-5-sec-input</input>
+		<actuator name="/ECAM/warnings/logic/eng/dual-failure-2-sec">
+			<input>/ECAM/warnings/logic/eng/dual-failure-2-sec-input</input>
 			<rate_limit sense="incr">0.5</rate_limit>
 			<rate_limit sense="decr">100</rate_limit>
 		</actuator>
@@ -2859,7 +2859,7 @@
 						/controls/engines/engine[0]/cutoff-switch eq 1
 						/controls/engines/engine[1]/cutoff-switch eq 1
 					</test>
-					/ECAM/warnings/logic/eng/dual-failure-5-sec eq 1
+					/ECAM/warnings/logic/eng/dual-failure-2-sec eq 1
 				</test>
 			</test>
 		</switch>