diff --git a/Systems/a320-fwc-phases.xml b/Systems/a320-fwc-phases.xml
index 44be70b8..345bb017 100644
--- a/Systems/a320-fwc-phases.xml
+++ b/Systems/a320-fwc-phases.xml
@@ -190,21 +190,21 @@
 			<test logic="OR" value="1">
 				<test logic="OR">
 					<test logic="AND">
-						/controls/engines/engine[0]/throttle ge 0.779
+						fadec/control-1/detent ge 4
 						fadec/limit/flex-active eq 1
 					</test>
 					<test logic="AND">
-						/controls/engines/engine[0]/throttle ge 0.99
+						fadec/control-1/detent eq 6
 						fadec/limit/flex-active eq 0
 					</test>
 				</test>
 				<test logic="OR">
 					<test logic="AND">
-						/controls/engines/engine[1]/throttle ge 0.779
+						fadec/control-2/detent ge 4
 						fadec/limit/flex-active eq 1
 					</test>
 					<test logic="AND">
-						/controls/engines/engine[1]/throttle ge 0.99
+						fadec/control-2/detent eq 6
 						fadec/limit/flex-active eq 0
 					</test>
 				</test>
@@ -224,8 +224,8 @@
 				<test logic="AND">
 					/ECAM/phases/phase-calculation/takeoff-power-timer ne 0
 					/ECAM/phases/phase-calculation/altitude-ge-1500 eq 0
-					/controls/engines/engine[0]/throttle ge 0.599
-					/controls/engines/engine[1]/throttle ge 0.599
+					fadec/control-1/detent ge 2
+					fadec/control-2/detent ge 2
 				</test>
 			</test>
 		</switch>
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index ee95caa5..58078f02 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -2341,14 +2341,14 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-1-tla-abv-6">
 			<default value="0"/>
 			<test logic="OR" value="1">
-				fadec/throttle-lever[0] ge 0.13333333333
+				fadec/control-1/lever/angle ge 6
 			</test>
 		</switch>
 		
 		<switch name="/ECAM/warnings/logic/eng/eng-1-tla-abv-6-2">
 			<default value="0"/>
 			<test logic="AND" value="1">
-				fadec/throttle-lever[0] ge 0.13333333333
+				fadec/control-1/lever/angle ge 6
 				/ECAM/phases/phase-calculation/takeoff-power eq 0
 			</test>
 		</switch>
@@ -2368,7 +2368,7 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-1-tla-idle">
 			<default value="0"/>
 			<test logic="OR" value="1">
-				fadec/throttle-lever[0] lt 0.055
+				fadec/control-1/lever/angle lt 2.6
 			</test>
 		</switch>
 		
@@ -2394,14 +2394,14 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-2-tla-abv-6">
 			<default value="0"/>
 			<test logic="OR" value="1">
-				fadec/throttle-lever[1] ge 0.13333333333
+				fadec/control-2/lever/angle ge 6
 			</test>
 		</switch>
 		
 		<switch name="/ECAM/warnings/logic/eng/eng-2-tla-abv-6-2">
 			<default value="0"/>
 			<test logic="AND" value="1">
-				fadec/throttle-lever[1] ge 0.13333333333
+				fadec/control-2/lever/angle ge 6
 				/ECAM/phases/phase-calculation/takeoff-power eq 0
 			</test>
 		</switch>
@@ -2421,7 +2421,7 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-2-tla-idle">
 			<default value="0"/>
 			<test logic="OR" value="1">
-				fadec/throttle-lever[1] lt 0.055
+				fadec/control-2/lever/angle lt 2.6
 			</test>
 		</switch>
 		
@@ -2578,8 +2578,10 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/engines/engine[0]/n2-actual ge 59.4
-				fadec/throttle-lever[0] ge 0.60
-				fadec/throttle-lever[0] lt 0.78
+				<test logic="OR">
+					fadec/control-1/detent eq 2
+					fadec/control-1/detent eq 3
+				</test>
 			</test>
 		</switch>
 		
@@ -2593,8 +2595,11 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/engines/engine[0]/n2-actual ge 59.4
-				fadec/throttle-lever[0] ge 0.60
-				fadec/throttle-lever[0] lt 0.83
+				<test logic="OR">
+					fadec/control-1/detent eq 2
+					fadec/control-1/detent eq 3
+					fadec/control-1/detent eq 4
+				</test>
 			</test>
 		</switch>
 		
@@ -2608,8 +2613,10 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/engines/engine[1]/n2-actual ge 59.4
-				fadec/throttle-lever[1] ge 0.60
-				fadec/throttle-lever[1] lt 0.78
+				<test logic="OR">
+					fadec/control-2/detent eq 2
+					fadec/control-2/detent eq 3
+				</test>
 			</test>
 		</switch>
 		
@@ -2623,8 +2630,11 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/engines/engine[1]/n2-actual ge 59.4
-				fadec/throttle-lever[1] ge 0.60
-				fadec/throttle-lever[1] lt 0.83
+				<test logic="OR">
+					fadec/control-2/detent eq 2
+					fadec/control-2/detent eq 3
+					fadec/control-2/detent eq 4
+				</test>
 			</test>
 		</switch>