diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index e40486ac..b75bebe5 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -10,10 +10,11 @@
 	<property value="27000">fadec/limit/rated-thrust</property>
 	<property value="18.9">fadec/limit/min-n1</property>
 	<property value="104">fadec/limit/max-n1</property>
+	<property value="0">fadec/athr/cmd</property>
 	<property value="1">fadec/limit/active-epr</property> <!-- Unused in this engine -->
 	
 	<!-- TODO -->
-	<property value="20">fadec/limit/idle</property>
+	<property value="35">fadec/limit/idle</property>
 	
 	<channel name="Thrust Limits">
 		
@@ -168,6 +169,18 @@
 			</function>
 		</fcs_function>
 		
+		<fcs_function name="fadec/limit/toga-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/toga</independentVar>
+					<tableData>
+						 18.9  0
+						104.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
 		<summer name="fadec/limit/flex-temp-input"> <!-- (Rated - Flex) + TAT -->
 			<input>fadec/limit/flex-rated-temp</input> <!-- Fix the calculations -->
 			<input>-fadec/limit/flex-temp</input>
@@ -242,6 +255,18 @@
 			</function>
 		</fcs_function>
 		
+		<fcs_function name="fadec/limit/mct-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/mct</independentVar>
+					<tableData>
+						 18.9  0
+						104.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
 		<fcs_function name="fadec/limit/climb-ref">
 			<function>
 				<product> <!-- TEMPORARY REPLACE WITH TABLE LATER -->
@@ -267,6 +292,30 @@
 				</quotient>
 			</function>
 		</fcs_function>
+		
+		<fcs_function name="fadec/limit/climb-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/climb</independentVar>
+					<tableData>
+						 18.9  0
+						104.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/idle-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/idle</independentVar>
+					<tableData>
+						 18.9  0
+						104.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
 	
 	</channel>
 	
@@ -391,19 +440,6 @@
 			</function>
 		</fcs_function>
 		
-		<switch name="fadec/control-1/throttle-output">
-			<default value="fadec/control-1/lever-norm"/> <!-- CHANGE THE -->
-			<!--test value="fadec/reverse-1/throttle-rev-cmd">
-				/controls/engines/engine[0]/reverse-lever gt 0
-			</test-->
-		</switch>
-		
-		<lag_filter name="fadec/control-1/throttle-fdm">
-			<input>fadec/control-1/throttle-output</input>
-			<c1>0.75</c1>
-			<output>fcs/throttle-pos-norm[0]</output>
-		</lag_filter>
-		
 		<switch name="fadec/control-1/detent">
 			<default value="0"/> <!-- IDLE -->
 			<test value="6"> <!-- TOGA -->
@@ -651,19 +687,6 @@
 			</function>
 		</fcs_function>
 		
-		<switch name="fadec/control-2/throttle-output">
-			<default value="fadec/control-2/lever-norm"/> <!-- CHANGE THE -->
-			<!--test value="fadec/reverse-2/throttle-rev-cmd">
-				/controls/engines/engine[1]/reverse-lever gt 0
-			</test-->
-		</switch>
-		
-		<lag_filter name="fadec/control-2/throttle-fdm">
-			<input>fadec/control-2/throttle-output</input>
-			<c1>0.75</c1>
-			<output>fcs/throttle-pos-norm[1]</output>
-		</lag_filter>
-		
 		<switch name="fadec/control-2/detent">
 			<default value="0"/> <!-- IDLE -->
 			<test value="6"> <!-- TOGA -->
@@ -875,6 +898,106 @@
 				fadec/limit/active-mode-int eq 2
 			</test>
 		</switch>
+		
+		<!-- A/THR Logic -->
+		<switch name="fadec/athr/max-clamp">
+			<default value="fadec/limit/climb-norm"/>
+			<test value="fadec/limit/mct-norm">
+				fadec/eng-out eq 1
+			</test>
+			<clipto>
+				<min>fadec/limit/idle-norm</min> <!-- Never force it below the idle limit -->
+				<max>1</max>
+			</clipto>
+		</switch>
+		
+		<fcs_function name="fadec/athr/max">
+			<function>
+				<max>
+					<property>fadec/control-1/lever-norm</property>
+					<property>fadec/control-2/lever-norm</property>
+				</max>
+			</function>
+			<clipto>
+				<min>fadec/limit/idle-norm</min> <!-- Never force it below the idle limit -->
+				<max>fadec/athr/max-clamp</max>
+			</clipto>
+		</fcs_function>
+		
+		<switch name="fadec/athr/active">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/it-autoflight/output/athr eq 1
+				fadec/eng-out eq 1
+				fadec/max-detent le 4
+				fadec/max-detent ge 1
+			</test>
+			<test logic="AND" value="1">
+				/it-autoflight/output/athr eq 1
+				fadec/max-detent eq 2
+			</test>
+			<test logic="AND" value="1">
+				/it-autoflight/output/athr eq 1
+				fadec/max-detent eq 1
+			</test>
+		</switch>
+		
+		<!-- Throttle Finals -->
+		<pure_gain name="fadec/control-1/throttle-clamped">
+			<input>fadec/control-1/lever-norm</input>
+			<gain>1.0</gain>
+			<clipto>
+				<min>fadec/limit/idle-norm</min>
+				<max>1</max>
+			</clipto>
+		</pure_gain>
+		
+		<switch name="fadec/control-1/throttle-output">
+			<default value="fadec/control-1/lever-norm"/>
+			<!--test value="fadec/reverse-1/throttle-rev-cmd">
+				/controls/engines/engine[0]/reverse-lever gt 0
+			</test-->
+			<test value="fadec/athr/cmd">
+				fadec/athr/active eq 1
+			</test>
+			<test value="fadec/control-1/throttle-clamped"> <!-- Last -->
+				/gear/gear[0]/wow eq 0
+			</test>
+		</switch>
+		
+		<lag_filter name="fadec/control-1/throttle-fdm">
+			<input>fadec/control-1/throttle-output</input>
+			<c1>0.75</c1>
+			<output>fcs/throttle-pos-norm[0]</output>
+		</lag_filter>
+		
+		<pure_gain name="fadec/control-2/throttle-clamped">
+			<input>fadec/control-2/lever-norm</input>
+			<gain>1.0</gain>
+			<clipto>
+				<min>fadec/limit/idle-norm</min>
+				<max>1</max>
+			</clipto>
+		</pure_gain>
+		
+		<switch name="fadec/control-2/throttle-output">
+			<default value="fadec/control-2/lever-norm"/>
+			<!--test value="fadec/reverse-2/throttle-rev-cmd">
+				/controls/engines/engine[1]/reverse-lever gt 0
+			</test-->
+			<test value="fadec/athr/cmd">
+				fadec/athr/active eq 1
+			</test>
+			<test value="fadec/control-2/throttle-clamped"> <!-- Last -->
+				/gear/gear[0]/wow eq 0
+			</test>
+		</switch>
+		
+		<lag_filter name="fadec/control-2/throttle-fdm">
+			<input>fadec/control-2/throttle-output</input>
+			<c1>0.75</c1>
+			<output>fcs/throttle-pos-norm[1]</output>
+		</lag_filter>
 	
 	</channel>
 	
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
deleted file mode 100644
index e14006d2..00000000
--- a/Systems/fadec-cfm.xml
+++ /dev/null
@@ -1,1320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
-
-<!-- A3XX CFM56/CFM Leap/PW PurePower FADEC -->
-
-<PropertyList>
-
-	<filter>
-		<name>OAT Thrust Scale</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/fadec/limit/toga</property>
-					<entry><ind> 18.9</ind><dep>0</dep></entry>
-					<entry><ind>104.0</ind><dep>1</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/engines/throttle-scale</output>
-	</filter>
-	
-	<filter>
-		<name>FLX Thrust Scale</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/fadec/limit/flex</property>
-					<entry><ind> 70</ind><dep>0.788</dep></entry>
-					<entry><ind> 40</ind><dep>0.813</dep></entry>
-					<entry><ind>-60</ind><dep>1.000</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/flx-throttle</output>
-	</filter>
-
-	<filter>
-		<name>IDLE Limit</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<condition>
-				<and>
-					<not-equals>
-						<property>/controls/flight/flaps-input</property>
-						<value>0</value>
-					</not-equals>
-					<equals>
-						<property>/gear/gear[0]/wow</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<value>0.1</value>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/gear/gear[0]/wow</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/atmosphere/density-altitude</property> 
-					<entry><ind>    0</ind><dep>0.035</dep></entry>
-					<entry><ind>42000</ind><dep>0.285</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/controls/engines/idle-limit</output>
-	</filter>
-	
-	<filter>
-		<name>Engines At Idle Stage 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<difference>
-					<table>
-						<max>
-							<property>/engines/engine[0]/n1-actual</property>
-							<property>/engines/engine[1]/n1-actual</property>
-						</max>
-						<entry><ind> 18.9</ind><dep>0</dep></entry>
-						<entry><ind>103.8</ind><dep>1</dep></entry>
-					</table>
-					<value>0.005</value>
-				</difference>
-			</expression>
-		</input>
-		<output>/engines/highest-n1-buffer</output>
-	</filter>
-	
-	<logic>
-		<name>Engines At Idle Stage 2</name>
-		<input>
-			<less-than-equals>
-				<property>/engines/highest-n1-buffer</property>
-				<property>/controls/engines/idle-limit</property>
-			</less-than-equals>
-		</input>
-		<output>/engines/both-at-idle</output>
-	</logic>
-	
-	<filter>
-		<name>MAN One</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[0]/throttle-pos</property>
-					<entry><ind>0.00</ind><dep>0.00</dep></entry>
-					<entry><ind>0.01</ind><dep>0.00</dep></entry>
-					<entry><ind>0.60</ind><dep>0.91</dep></entry>
-					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.95</dep></entry>
-					<entry><ind>0.83</ind><dep>0.95</dep></entry>
-					<entry><ind>0.95</ind><dep>0.99</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-man</output>
-	</filter>
-	
-	<filter>
-		<name>MAN Two</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[1]/throttle-pos</property>
-					<entry><ind>0.00</ind><dep>0.00</dep></entry>
-					<entry><ind>0.01</ind><dep>0.00</dep></entry>
-					<entry><ind>0.60</ind><dep>0.91</dep></entry>
-					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.95</dep></entry>
-					<entry><ind>0.83</ind><dep>0.95</dep></entry>
-					<entry><ind>0.95</ind><dep>0.99</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-man</output>
-	</filter>
-	
-	<filter>
-		<name>MAN CMD One</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<product>
-					<table>
-						<property>/controls/engines/engine[0]/throttle-pos</property>
-						<entry><ind>0.00</ind><dep>0.00</dep></entry>
-						<entry><ind>0.01</ind><dep>0.00</dep></entry>
-						<entry><ind>0.60</ind><dep>0.91</dep></entry>
-						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.95</dep></entry>
-						<entry><ind>0.83</ind><dep>0.95</dep></entry>
-						<entry><ind>0.95</ind><dep>0.99</dep></entry>
-					</table>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-cmd-man</output>
-	</filter>
-	
-	<filter>
-		<name>MAN CMD Two</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<product>
-					<table>
-						<property>/controls/engines/engine[1]/throttle-pos</property>
-						<entry><ind>0.00</ind><dep>0.00</dep></entry>
-						<entry><ind>0.01</ind><dep>0.00</dep></entry>
-						<entry><ind>0.60</ind><dep>0.91</dep></entry>
-						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.95</dep></entry>
-						<entry><ind>0.83</ind><dep>0.95</dep></entry>
-						<entry><ind>0.95</ind><dep>0.99</dep></entry>
-					</table>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-cmd-man</output>
-	</filter>
-	
-	<filter>
-		<name>N1 CMD 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<table>
-					<product>
-						<value>0.99</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[0]/throttle-cmd-man</property>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/n1-actual-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>N1 CMD 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<table>
-					<product>
-						<value>0.99</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[1]/throttle-cmd-man</property>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/n1-actual-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED 1</name>
-		<type>noise-spike</type>
-		<input>/controls/engines/throttle-cmd-pid</input>
-		<output>/controls/engines/engine[0]/throttle-cmd</output>
-		<max-rate-of-change>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<value>1000</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[0]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<or>
-						<equals>
-							<property>/it-autoflight/output/thr-mode</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/mode/thr</property>
-							<value>RETARD</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<value>0.3</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[0]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.05</value>
-		</max-rate-of-change>
-		<max-rate-of-change>1000</max-rate-of-change>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED LIMIT 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>/controls/engines/engine[0]/throttle-cmd</input>
-		<output>/controls/engines/engine[0]/throttle-cmd-feed</output>
-		<min>
-			<condition>
-				<equals>
-					<property>/it-autoflight/mode/thr</property>
-					<value>RETARD</value>
-				</equals>
-			</condition>
-			<value>0.0</value>
-		</min>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>
-			<property>/controls/engines/engine[0]/throttle-man</property>
-		</max>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED 2</name>
-		<type>noise-spike</type>
-		<input>/controls/engines/throttle-cmd-pid</input>
-		<output>/controls/engines/engine[1]/throttle-cmd</output>
-		<max-rate-of-change>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<value>1000</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[1]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<or>
-						<equals>
-							<property>/it-autoflight/output/thr-mode</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/mode/thr</property>
-							<value>RETARD</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<value>0.3</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[1]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.05</value>
-		</max-rate-of-change>
-		<max-rate-of-change>1000</max-rate-of-change>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED LIMIT 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>/controls/engines/engine[1]/throttle-cmd</input>
-		<output>/controls/engines/engine[1]/throttle-cmd-feed</output>
-		<min>
-			<condition>
-				<equals>
-					<property>/it-autoflight/mode/thr</property>
-					<value>RETARD</value>
-				</equals>
-			</condition>
-			<value>0.0</value>
-		</min>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>
-			<property>/controls/engines/engine[1]/throttle-man</property>
-		</max>
-	</filter>
-	
-	<filter>
-		<name>Throttle 1</name>
-		<debug>false</debug>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/alpha-floor</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/toga-lk</property>
-						<value>0</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>IDLE</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle-man</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[0]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle-cmd-feed</property>
-		</input>
-		<output>
-			<property>/controls/engines/engine[0]/throttle-fdm</property>
-		</output>
-	</filter>
-	
-	<filter>
-		<name>Throttle 2</name>
-		<debug>false</debug>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/alpha-floor</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/toga-lk</property>
-						<value>0</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>IDLE</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle-man</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[1]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle-cmd-feed</property>
-		</input>
-		<output>
-			<property>/controls/engines/engine[1]/throttle-fdm</property>
-		</output>
-	</filter>
-	
-	<filter>
-		<name>N1 Limit TOGA</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>/fdm/jsbsim/fadec/limit/toga</input>
-		<output>/fdm/jsbsim/fadec/n1/toga-lim</output>
-	</filter>
-	
-	<filter>
-		<name>N1 Limit MCT</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<product>
-						<value>0.95</value>
-						<property>/controls/engines/throttle-scale</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/fdm/jsbsim/fadec/n1/mct-lim</output>
-	</filter>
-	
-	<filter>
-		<name>N1 Limit FLX</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>/fdm/jsbsim/fadec/limit/flex</input>
-		<output>/fdm/jsbsim/fadec/n1/flx-lim</output>
-	</filter>
-	
-	<filter>
-		<name>N1 Limit CLB</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<product>
-						<value>0.91</value>
-						<property>/controls/engines/throttle-scale</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/fdm/jsbsim/fadec/n1/clb-lim</output>
-	</filter>
-	
-	<filter>
-		<name>Throttle Output One</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[0]/reverse-cmd</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[0]/reverse-lever</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/fdm/jsbsim/fadec/thr-locked</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/fdm/jsbsim/fadec/thr-lock-cmd[0]</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[0]/throttle-fdm</property>
-					<property>/engines/flx-throttle</property>
-				</product>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[0]/throttle-fdm</property>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-output</output>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>1.0</max>
-	</filter>
-	
-	<filter>
-		<name>Throttle Output Two</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[1]/reverse-cmd</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[1]/reverse-lever</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/fdm/jsbsim/fadec/thr-locked</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/fdm/jsbsim/fadec/thr-lock-cmd[1]</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[1]/throttle-fdm</property>
-					<property>/engines/flx-throttle</property>
-				</product>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[1]/throttle-fdm</property>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-output</output>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>1.0</max>
-	</filter>
-	
-	<filter>
-		<name>EGT L</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/engines/engine[0]/state</property>
-						<value>3</value>
-					</equals>
-					<greater-than-equals>
-						<property>/engines/engine[1]/n1-actual</property>
-						<value>18.9</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/n1-actual</property> 
-					<entry><ind> 18.9</ind><dep>434</dep></entry>
-					<entry><ind>110.0</ind><dep>620</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/egt-actual</output>
-	</filter>
-	
-	<filter>
-		<name>EGT R</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/engines/engine[1]/state</property>
-						<value>3</value>
-					</equals>
-					<greater-than-equals>
-						<property>/engines/engine[1]/n1-actual</property>
-						<value>18.9</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/n1-actual</property> 
-					<entry><ind> 18.9</ind><dep>434</dep></entry>
-					<entry><ind>110.0</ind><dep>620</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/egt-actual</output>
-	</filter>
-
-</PropertyList>
diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml
index 0e56c55d..88bb19fa 100644
--- a/Systems/fmgc-thrust.xml
+++ b/Systems/fmgc-thrust.xml
@@ -41,7 +41,7 @@
 			<condition>
 				<and>
 					<equals>
-						<property>/it-autoflight/output/athr</property>
+						<property>/fdm/jsbsim/fadec/athr/active</property>
 						<value>1</value>
 					</equals>
 					<equals>
@@ -104,7 +104,7 @@
 			<condition>
 				<and>
 					<equals>
-						<property>/it-autoflight/output/athr</property>
+						<property>/fdm/jsbsim/fadec/athr/active</property>
 						<value>1</value>
 					</equals>
 					<equals>
@@ -137,7 +137,7 @@
 			<condition>
 				<and>
 					<equals>
-						<property>/it-autoflight/output/athr</property>
+						<property>/fdm/jsbsim/fadec/athr/active</property>
 						<value>1</value>
 					</equals>
 					<equals>
@@ -153,13 +153,13 @@
 		</enable>
 		<input>/it-autoflight/internal/current-speed-input</input>
 		<reference>/it-autoflight/internal/athr-kts</reference>
-		<output>/controls/engines/throttle-cmd-pid</output>
+		<output>/fdm/jsbsim/fadec/athr/cmd</output>
 		<config>
 			<Kp>0.055</Kp>
 			<Ti>9.0</Ti>
 			<Td>0.00001</Td>
-			<u_min>/controls/engines/idle-limit</u_min>
-			<u_max>/controls/engines/throttle-pid-max</u_max>
+			<u_min>/fdm/jsbsim/fadec/limit/idle-norm</u_min>
+			<u_max>/fdm/jsbsim/fadec/athr/max</u_max>
 		</config>
 	</pid-controller>
 	
@@ -170,7 +170,7 @@
 			<condition>
 				<and>
 					<equals>
-						<property>/it-autoflight/output/athr</property>
+						<property>/fdm/jsbsim/fadec/athr/active</property>
 						<value>1</value>
 					</equals>
 					<equals>
@@ -192,13 +192,13 @@
 			<property>/it-autoflight/internal/athr-mach</property>
 			<scale>1000</scale>
 		</reference>
-		<output>/controls/engines/throttle-cmd-pid</output>
+		<output>/fdm/jsbsim/fadec/athr/cmd</output>
 		<config>
 			<Kp>0.055</Kp>
 			<Ti>9.0</Ti>
 			<Td>0.00001</Td>
-			<u_min>/controls/engines/idle-limit</u_min>
-			<u_max>/controls/engines/throttle-pid-max</u_max>
+			<u_min>/fdm/jsbsim/fadec/limit/idle-norm</u_min>
+			<u_max>/fdm/jsbsim/fadec/athr/max</u_max>
 		</config>
 	</pid-controller>
 	
@@ -211,7 +211,7 @@
 			<condition>
 				<and>
 					<equals>
-						<property>/it-autoflight/output/athr</property>
+						<property>/fdm/jsbsim/fadec/athr/active</property>
 						<value>1</value>
 					</equals>
 					<equals>
@@ -222,7 +222,7 @@
 			</condition>
 		</enable>
 		<input>0</input>
-		<output>/controls/engines/throttle-cmd-pid</output>
+		<output>/fdm/jsbsim/fadec/athr/cmd</output>
 	</filter>
 	
 	<filter>
@@ -234,7 +234,7 @@
 			<condition>
 				<and>
 					<equals>
-						<property>/it-autoflight/output/athr</property>
+						<property>/fdm/jsbsim/fadec/athr/active</property>
 						<value>1</value>
 					</equals>
 					<equals>
@@ -245,7 +245,23 @@
 			</condition>
 		</enable>
 		<input>1</input>
-		<output>/controls/engines/throttle-cmd-pid</output>
+		<output>/fdm/jsbsim/fadec/athr/cmd</output>
+	</filter>
+	
+	<filter>
+		<name>System Command: Throttle Inactive Sync</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<enable>
+			<condition>
+				<not-equals>
+					<property>/fdm/jsbsim/fadec/athr/active</property>
+					<value>1</value>
+				</not-equals>
+			</condition>
+		</enable>
+		<input>/fdm/jsbsim/fadec/athr/max</input> <!-- Highest throttle -->
+		<output>/fdm/jsbsim/fadec/athr/cmd</output>
 	</filter>
 
 </PropertyList>