diff --git a/Nasal/ECAM/ECAM-phases.nas b/Nasal/ECAM/ECAM-phases.nas
index baa5ca52..1c909150 100644
--- a/Nasal/ECAM/ECAM-phases.nas
+++ b/Nasal/ECAM/ECAM-phases.nas
@@ -46,7 +46,7 @@ var FWC = {
 		recallOutput: props.globals.initNode("/ECAM/flipflop/recall-output", 0, "BOOL"),
 	},
 	Logic: {
-		gnd: props.globals.getNode("/ECAM/ground-calc-immediate"),
+		gnd: props.globals.getNode("/ECAM/logic/ground-calc-immediate"),
 		IRSinAlign: props.globals.initNode("/ECAM/irs-in-align", 0, "BOOL"),
 		feet1500: props.globals.getNode("/ECAM/phases/phase-calculation/altitude-ge-1500"),
 		feet800: props.globals.getNode("/ECAM/phases/phase-calculation/altitude-ge-800"),
@@ -73,6 +73,7 @@ var FWC = {
 };
 
 var phaseLoop = func() {
+	if ((systems.ELEC.Bus.acEss.getValue() < 110 and systems.ELEC.Bus.ac2.getValue() < 110) or pts.Acconfig.running.getBoolValue()) { return; }
 	if (pts.Sim.Replay.replayActive.getBoolValue()) { return; }
 	
 	myPhase = pts.ECAM.fwcWarningPhase.getValue();
@@ -143,7 +144,7 @@ var phaseLoop = func() {
 	}
 	
 	# Actual Phases
-	if ((!FWC.Logic.gnd.getBoolValue() and FWC.Timer.gnd2Sec.getValue() != 1 and FWC.Timer.eng1and2Off.getValue() and myPhase != 9) and !FWC.Monostable.phase1Output.getBoolValue()) {
+	if ((FWC.Logic.gnd.getBoolValue() and FWC.Timer.eng1and2Off.getValue() and myPhase != 9) and !FWC.Monostable.phase1Output.getBoolValue()) {
 		setPhase(1);
 	}
 	
diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas
index 9528dfee..95c49543 100644
--- a/Nasal/Libraries/property-tree-setup.nas
+++ b/Nasal/Libraries/property-tree-setup.nas
@@ -58,7 +58,7 @@ var Controls = {
 };
 
 var ECAM = {
-	fwcWarningPhase: props.globals.initNode("/ECAM/warning-phase", 1, "INT"),
+	fwcWarningPhase: props.globals.getNode("/ECAM/warning-phase"),
 };
 
 var Engines = {
diff --git a/Systems/a320-fwc-phases.xml b/Systems/a320-fwc-phases.xml
index f2e78d6a..23412c65 100644
--- a/Systems/a320-fwc-phases.xml
+++ b/Systems/a320-fwc-phases.xml
@@ -8,7 +8,7 @@
 		
 		<actuator name="/ECAM/timer/ground-calc">
             <description>Timer for the ECAM phase system</description>
-            <input>/ECAM/ground-calc-immediate</input>
+            <input>/ECAM/logic/ground-calc-immediate</input>
             <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
         </actuator>
@@ -85,7 +85,7 @@
 			</test>
 		</switch>
 		
-		<switch name="/ECAM/ground-calc-immediate">
+		<switch name="/ECAM/logic/ground-calc-immediate">
 			<default value="0"/>
 			<test logic="OR" value="1">
 				/ECAM/flipflop/radar-altimeter-5-output eq 1
diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml
index ac9e1af3..e89c7dfc 100644
--- a/Systems/ecam-proprules.xml
+++ b/Systems/ecam-proprules.xml
@@ -198,7 +198,7 @@
 			<value>2.0</value>
 		</time>
 		<S>
-			<property>/ECAM/ground-calc-immediate</property>
+			<property>/ECAM/logic/ground-calc-immediate</property>
 		</S>
 		<output>ECAM/phases/monostable/gnd-output</output>
 	</flipflop>
@@ -209,7 +209,7 @@
 			<value>2.5</value>
 		</time>
 		<S>
-			<property>/ECAM/ground-calc-immediate</property>
+			<property>/ECAM/logic/ground-calc-immediate</property>
 		</S>
 		<output>ECAM/phases/monostable/gnd-output-2</output>
 	</flipflop>