diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index 754d9c0d..25469134 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 	
 	<propulsion>
-		<engine file="cfm56_5a1">
+		<engine file="cfm56_5a1_1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> -5.755 </y>
@@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 		
-		<engine file="cfm56_5a1">
+		<engine file="cfm56_5a1_2">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> 5.755 </y>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index 30c57093..684c57f4 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 	
 	<propulsion>
-		<engine file="cfm56_5b4">
+		<engine file="cfm56_5b4_1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> -5.755 </y>
@@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 		
-		<engine file="cfm56_5b4">
+		<engine file="cfm56_5b4_2">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> 5.755 </y>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index e75a5f6e..111fc55b 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 	
 	<propulsion>
-		<engine file="v2527_a5">
+		<engine file="v2527_a5_1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> -5.755 </y>
@@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 		
-		<engine file="v2527_a5">
+		<engine file="v2527_a5_2">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> 5.755 </y>
diff --git a/A320-main.xml b/A320-main.xml
index cc657706..ed522322 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -355,6 +355,8 @@
 			<z-offset-min-m type="float">30.0</z-offset-min-m>
 			<z-offset-max-m type="float">300.0</z-offset-max-m>
 		</current-view>
+		
+		 <minimum-fg-version>2018.1.0</minimum-fg-version>
 	</sim>
 
 	<consumables>
@@ -997,8 +999,20 @@
 			</mouse>
 		</mice>
 		<keyboard>
+			<key n="4">
+				<name>CTRL-d</name>
+				<desc>Autothrottle Disconnect</desc>
+				<binding>
+					<command>nasal</command>
+					<script>
+						if (getprop("/it-autoflight/output/athr") == 1) {
+							setprop("/it-autoflight/input/athr", 0);
+						}
+					</script>
+				</binding>
+			</key>
 			<key n="24">
-				<name>Ctrl-X</name>
+				<name>Ctrl-x</name>
 				<desc>Reset zoom to default</desc>
 				<binding>
 					<command>nasal</command>
@@ -1226,6 +1240,21 @@
 					</script>
 				</binding>
 			</key>
+			<key n="68">
+				<name>D</name>
+				<desc>Autopilot Disconnect</desc>
+				<binding>
+					<command>nasal</command>
+					<script>
+						if (getprop("/it-autoflight/output/ap1") == 1) {
+							setprop("/it-autoflight/input/ap1", 0);
+						}
+						if (getprop("/it-autoflight/output/ap2") == 1) {
+							setprop("/it-autoflight/input/ap2", 0);
+						}
+					</script>
+				</binding>
+			</key>
 			<key n="88">
 				<name>X</name>
 				<desc>Increase field of view</desc>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index d7e063af..06583b4d 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 	
 	<propulsion>
-		<engine file="leap1a26">
+		<engine file="leap1a26_1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> -5.755 </y>
@@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 		
-		<engine file="leap1a26">
+		<engine file="leap1a26_2">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> 5.755 </y>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 02e096be..cb7fcf25 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 	
 	<propulsion>
-		<engine file="pw1127g">
+		<engine file="pw1127g_1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> -5.755 </y>
@@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 		
-		<engine file="pw1127g">
+		<engine file="pw1127g_2">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> 5.755 </y>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index ca253478..85c34687 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -126,9 +126,9 @@ setlistener("/systems/acconfig/new-revision", func {
 });
 
 var mismatch_chk = func {
-	if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201730) {
+	if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201810) {
 		setprop("/systems/acconfig/mismatch-code", "0x121");
-		setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2017.3.0.");
+		setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.1.0.");
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
@@ -344,14 +344,14 @@ var taxi = func {
 	setprop("/controls/APU/master", 1);
 	setprop("/controls/APU/start", 1);
 	var apu_rpm_chk = setlistener("/systems/apu/rpm", func {
-		if (getprop("/systems/apu/rpm") >= 99) {
+		if (getprop("/systems/apu/rpm") >= 98) {
 			removelistener(apu_rpm_chk);
 			taxi_b();
 		}
 	});
 }
 var taxi_b = func {
-	# Continue with engine start prep, and start engine 2.
+	# Continue with engine start prep, and start engines.
 	setprop("/controls/fuel/tank0pump1", 1);
 	setprop("/controls/fuel/tank0pump2", 1);
 	setprop("/controls/fuel/tank1pump1", 1);
diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml
index 8bc67e6c..a6fc2457 100644
--- a/AircraftConfig/help.xml
+++ b/AircraftConfig/help.xml
@@ -96,6 +96,10 @@
 				<halign>left</halign>
 				<label>F2 - Engage/Increase Reverse Thrust</label>
 			</text>
+			<text>
+				<halign>left</halign>
+				<label>DEL - Toggle Reverse Thrust</label>
+			</text>
 			<text>
 				<halign>left</halign>
 				<label>E - Set Idle Thrust</label>
@@ -104,10 +108,6 @@
 				<halign>left</halign>
 				<label>F - Set TOGA Thrust</label>
 			</text>
-			<text>
-				<halign>left</halign>
-				<label>DEL - Toggle Reverse Thrust</label>
-			</text>
 			<text>
 				<halign>left</halign>
 				<label>CTRL + B - Cycle Spoilers</label>
@@ -116,6 +116,14 @@
 				<halign>left</halign>
 				<label>SHIFT + B - Toggle Parking Brake</label>
 			</text>
+			<text>
+				<halign>left</halign>
+				<label>CTRL + D - Disconnect Autothrottle</label>
+			</text>
+			<text>
+				<halign>left</halign>
+				<label>SHIFT + D - Disconnect Autopilot</label>
+			</text>
 			
 		</group>
 	
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 6541e2bb..542b7f4a 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -396,7 +396,7 @@
 			</checkbox>
 			
 			<checkbox>
-				<label>Skip ADIRS Alignment</label>
+				<label>ADIRS Aligns Instantly</label>
 				<halign>left</halign>
 				<property>/controls/adirs/skip</property>
 				<binding>
diff --git a/AircraftConfig/update.xml b/AircraftConfig/update.xml
index 71fabc66..6f5dfef3 100644
--- a/AircraftConfig/update.xml
+++ b/AircraftConfig/update.xml
@@ -104,7 +104,9 @@
 				<command>nasal</command>
 				<script>
 				if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
-					acconfig.welcome_dlg.open();
+					if (getprop("/systems/acconfig/options/welcome-skip") != 1) {
+						acconfig.welcome_dlg.open();
+					}
 				} else {
 					acconfig.error_mismatch.open();
 				}
diff --git a/Engines/cfm56_5a1.xml b/Engines/cfm56_5a1.xml
deleted file mode 100644
index 42062ede..00000000
--- a/Engines/cfm56_5a1.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<turbine_engine name="CFM56_5A1">
-
-	<milthrust>     25000 </milthrust>
-	<bypassratio>     8.1 </bypassratio>
-	<tsfc>            0.5 </tsfc>
-	<bleed>          0.03 </bleed>
-	<idlen1>         19.7 </idlen1>
-	<idlen2>         61.2 </idlen2>
-	<n1spinup>        0.2 </n1spinup>
-	<n2spinup>        1.0 </n2spinup>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
-
-	<function name="IdleThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			    -10000   0       10000   20000   30000   40000   50000
-			0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-			0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-			0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-			0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-			0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-			1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
-			</tableData>
-		</table>
-	</function>
-
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			     -10000   0       10000   20000   30000   40000   50000
-			0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-			0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-			0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-			0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-			0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-			0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-			1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-			1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
-	</function>
-	
-</turbine_engine>
diff --git a/Engines/cfm56_5a1_1.xml b/Engines/cfm56_5a1_1.xml
new file mode 100644
index 00000000..3e6d1eb7
--- /dev/null
+++ b/Engines/cfm56_5a1_1.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="CFM56_5A1">
+	
+	<milthrust>     25000 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/cfm56_5a1_2.xml b/Engines/cfm56_5a1_2.xml
new file mode 100644
index 00000000..acfa8b71
--- /dev/null
+++ b/Engines/cfm56_5a1_2.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="CFM56_5A1">
+	
+	<milthrust>     25000 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/cfm56_5b4.xml b/Engines/cfm56_5b4.xml
deleted file mode 100644
index 49983bb5..00000000
--- a/Engines/cfm56_5b4.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<turbine_engine name="CFM56_5B4">
-
-	<milthrust>     27000 </milthrust>
-	<bypassratio>     8.1 </bypassratio>
-	<tsfc>            0.5 </tsfc>
-	<bleed>          0.03 </bleed>
-	<idlen1>         19.7 </idlen1>
-	<idlen2>         61.2 </idlen2>
-	<n1spinup>        0.2 </n1spinup>
-	<n2spinup>        1.0 </n2spinup>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
-
-	<function name="IdleThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			    -10000   0       10000   20000   30000   40000   50000
-			0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-			0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-			0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-			0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-			0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-			1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
-			</tableData>
-		</table>
-	</function>
-
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			     -10000   0       10000   20000   30000   40000   50000
-			0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-			0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-			0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-			0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-			0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-			0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-			1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-			1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
-	</function>
-	
-</turbine_engine>
diff --git a/Engines/cfm56_5b4_1.xml b/Engines/cfm56_5b4_1.xml
new file mode 100644
index 00000000..48139e8a
--- /dev/null
+++ b/Engines/cfm56_5b4_1.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="CFM56_5B4">
+	
+	<milthrust>     27000 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/cfm56_5b4_2.xml b/Engines/cfm56_5b4_2.xml
new file mode 100644
index 00000000..9ff26da9
--- /dev/null
+++ b/Engines/cfm56_5b4_2.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="CFM56_5B4">
+	
+	<milthrust>     27000 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/leap1a26.xml b/Engines/leap1a26.xml
deleted file mode 100644
index e3bc3491..00000000
--- a/Engines/leap1a26.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<turbine_engine name="LEAP1A26">
-
-	<milthrust>     27000 </milthrust>
-	<bypassratio>     8.1 </bypassratio>
-	<tsfc>            0.5 </tsfc>
-	<bleed>          0.03 </bleed>
-	<idlen1>         19.7 </idlen1>
-	<idlen2>         61.2 </idlen2>
-	<n1spinup>        0.2 </n1spinup>
-	<n2spinup>        1.0 </n2spinup>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
-
-	<function name="IdleThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			    -10000   0       10000   20000   30000   40000   50000
-			0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-			0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-			0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-			0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-			0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-			1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
-			</tableData>
-		</table>
-	</function>
-
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			     -10000   0       10000   20000   30000   40000   50000
-			0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-			0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-			0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-			0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-			0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-			0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-			1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-			1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
-	</function>
-	
-</turbine_engine>
diff --git a/Engines/leap1a26_1.xml b/Engines/leap1a26_1.xml
new file mode 100644
index 00000000..05477ba7
--- /dev/null
+++ b/Engines/leap1a26_1.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="LEAP1A26">
+	
+	<milthrust>     27000 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/leap1a26_2.xml b/Engines/leap1a26_2.xml
new file mode 100644
index 00000000..2ab51019
--- /dev/null
+++ b/Engines/leap1a26_2.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="LEAP1A26">
+	
+	<milthrust>     27000 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/pw1127g.xml b/Engines/pw1127g.xml
deleted file mode 100644
index 394f6f26..00000000
--- a/Engines/pw1127g.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<turbine_engine name="PW1127G">
-
-	<milthrust>     26345 </milthrust>
-	<bypassratio>     8.1 </bypassratio>
-	<tsfc>            0.5 </tsfc>
-	<bleed>          0.03 </bleed>
-	<idlen1>         19.7 </idlen1>
-	<idlen2>         61.2 </idlen2>
-	<n1spinup>        0.2 </n1spinup>
-	<n2spinup>        1.0 </n2spinup>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
-
-	<function name="IdleThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			    -10000   0       10000   20000   30000   40000   50000
-			0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-			0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-			0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-			0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-			0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-			1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
-			</tableData>
-		</table>
-	</function>
-
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			     -10000   0       10000   20000   30000   40000   50000
-			0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-			0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-			0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-			0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-			0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-			0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-			1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-			1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
-	</function>
-	
-</turbine_engine>
diff --git a/Engines/pw1127g_1.xml b/Engines/pw1127g_1.xml
new file mode 100644
index 00000000..8d13b325
--- /dev/null
+++ b/Engines/pw1127g_1.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="PW1127G">
+	
+	<milthrust>     26345 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/pw1127g_2.xml b/Engines/pw1127g_2.xml
new file mode 100644
index 00000000..6dfae068
--- /dev/null
+++ b/Engines/pw1127g_2.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="PW1127G">
+	
+	<milthrust>     26345 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/v2527_a5.xml b/Engines/v2527_a5.xml
deleted file mode 100644
index 9c1253d3..00000000
--- a/Engines/v2527_a5.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<turbine_engine name="V2527_A5">
-
-	<milthrust>     26600 </milthrust>
-	<bypassratio>     8.1 </bypassratio>
-	<tsfc>            0.5 </tsfc>
-	<bleed>          0.03 </bleed>
-	<idlen1>         22.4 </idlen1>
-	<idlen2>         60.9 </idlen2>
-	<n1spinup>        0.2 </n1spinup>
-	<n2spinup>        1.0 </n2spinup>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
-
-	<function name="IdleThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			    -10000   0       10000   20000   30000   40000   50000
-			0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-			0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-			0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-			0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-			0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-			1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
-			</tableData>
-		</table>
-	</function>
-
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-			     -10000   0       10000   20000   30000   40000   50000
-			0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-			0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-			0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-			0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-			0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-			0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-			1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-			1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
-	</function>
-	
-</turbine_engine>
diff --git a/Engines/v2527_a5_1.xml b/Engines/v2527_a5_1.xml
new file mode 100644
index 00000000..074cecc2
--- /dev/null
+++ b/Engines/v2527_a5_1.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="V2527_A5">
+	
+	<milthrust>     26600 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         22.4 </idlen1>
+	<idlen2>         60.9 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/Engines/v2527_a5_2.xml b/Engines/v2527_a5_2.xml
new file mode 100644
index 00000000..2810b1bd
--- /dev/null
+++ b/Engines/v2527_a5_2.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="V2527_A5">
+	
+	<milthrust>     26600 </milthrust>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         22.4 </idlen1>
+	<idlen2>         60.9 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </maxn2>
+	<augmented>         0 </augmented>
+	<injected>          0 </injected>
+	
+	<function name="N1SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N1SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolUp">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="N2SpoolDown">
+		<table>
+			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
+			<tableData>
+				 24   1.1
+				 28   2.9
+				 46   9.7
+				 68  15.4
+				 80  19.6
+				 94  21.4
+				103  23.6
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="IdleThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				    -10000   0       10000   20000   30000   40000   50000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+	<function name="MilThrust">
+		<table>
+			<independentVar lookup="row">velocities/mach</independentVar>
+			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+			<tableData>
+				     -10000   0       10000   20000   30000   40000   50000
+				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+
+</turbine_engine>
diff --git a/INSTALL.md b/INSTALL.md
index caa691ba..140410f6 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,7 +1,7 @@
 # INSTALL
 ## Prerequisites
 Have at least following versions installed:
-* FlightGear 2017.3.0 or newer
+* FlightGear 2018.1.0 or newer
 
 ## Install using ZIP Snapshot
 [Download](https://github.com/it0uchpods/IDG-A32X/archive/master.zip) the zip file.  
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index fd17bc84..53e90f7d 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
-<!-- Provide a general summary of the issue/question in the title above. -->
-<!-- Incase of a question, remove the format below, and write your question. -->
+<!-- Provide a general summary of the issue in the title above. -->
+<!-- Issues are for reporting bugs or problems only. If you have a feature request, please write in the forums. -->
 
 ### Expected Behavior
 <!-- Tell us what should happen. -->
@@ -16,4 +16,4 @@
 1.
 2.
 3.
-4.
+4.
\ No newline at end of file
diff --git a/Models/FlightDeck/res/fd_complete.ac b/Models/FlightDeck/res/fd_complete.ac
index 1eb770d2..ddb3c3cc 100644
--- a/Models/FlightDeck/res/fd_complete.ac
+++ b/Models/FlightDeck/res/fd_complete.ac
@@ -161418,13 +161418,13 @@ numsurf 2
 SURF 0X12
 mat 1
 refs 2
-2 0 0
-3 0 0
+0 0 0
+1 0 0
 SURF 0X12
 mat 1
 refs 2
-0 0 0
-1 0 0
+2 0 0
+3 0 0
 kids 0
 OBJECT poly
 name "iesi"
@@ -163905,55 +163905,55 @@ numvert 169
 -0.02028 -0.10862 0.02178
 -0.01903 -0.10792 0.02216
 -0.01812 -0.10742 0.02321
--0.02078 -0.10273 0.02607
--0.02045 -0.10255 0.02468
--0.02167 -0.10323 0.02709
--0.02288 -0.1039 0.02746
--0.0241 -0.10458 0.02709
--0.02499 -0.10508 0.02607
--0.02531 -0.10526 0.02468
--0.02499 -0.10508 0.02328
--0.0241 -0.10458 0.02227
--0.02288 -0.1039 0.02189
--0.02167 -0.10323 0.02227
--0.02078 -0.10273 0.02328
+-0.01938 -0.10553 0.02607
+-0.01905 -0.10535 0.02468
+-0.02027 -0.10603 0.02709
+-0.02148 -0.1067 0.02746
+-0.0227 -0.10738 0.02709
+-0.02359 -0.10788 0.02607
+-0.02391 -0.10806 0.02468
+-0.02359 -0.10788 0.02328
+-0.0227 -0.10738 0.02227
+-0.02148 -0.1067 0.02189
+-0.02027 -0.10603 0.02227
+-0.01938 -0.10553 0.02328
 -0.00735 -0.13178 0.02464
--0.02136 -0.10004 0.02662
--0.02093 -0.0998 0.02477
--0.02254 -0.1007 0.02798
--0.02416 -0.1016 0.02847
--0.02577 -0.1025 0.02798
--0.02696 -0.10316 0.02662
--0.02739 -0.1034 0.02477
--0.02696 -0.10316 0.02292
--0.02577 -0.1025 0.02157
--0.02416 -0.1016 0.02107
--0.02254 -0.1007 0.02157
--0.02136 -0.10004 0.02292
--0.02166 -0.09744 0.03183
--0.02877 -0.1014 0.03183
--0.02522 -0.09942 0.03292
--0.02093 -0.09698 0.02889
--0.03137 -0.10284 0.02885
--0.02093 -0.09697 0.02484
--0.03232 -0.10338 0.02478
--0.02092 -0.09701 0.0206
--0.03137 -0.10284 0.02072
--0.02166 -0.09744 0.01774
--0.02877 -0.1014 0.01774
--0.02522 -0.09942 0.01665
--0.03543 -0.10507 0.0165
--0.02089 -0.09697 0.03307
--0.03543 -0.10507 0.03307
--0.02089 -0.09697 0.0165
--0.02148 -0.09591 0.03307
--0.03602 -0.10402 0.03307
--0.02148 -0.09591 0.0165
--0.03602 -0.10402 0.0165
--0.02229 -0.09503 0.01678
--0.03635 -0.10286 0.03279
--0.02229 -0.09503 0.03279
--0.03635 -0.10286 0.01678
+-0.01996 -0.10284 0.02662
+-0.01953 -0.1026 0.02477
+-0.02114 -0.1035 0.02798
+-0.02276 -0.1044 0.02847
+-0.02437 -0.1053 0.02798
+-0.02556 -0.10596 0.02662
+-0.02599 -0.1062 0.02477
+-0.02556 -0.10596 0.02292
+-0.02437 -0.1053 0.02157
+-0.02276 -0.1044 0.02107
+-0.02114 -0.1035 0.02157
+-0.01996 -0.10284 0.02292
+-0.02026 -0.10024 0.03183
+-0.02737 -0.1042 0.03183
+-0.02382 -0.10222 0.03292
+-0.01953 -0.09978 0.02889
+-0.02997 -0.10564 0.02885
+-0.01953 -0.09977 0.02484
+-0.03092 -0.10618 0.02478
+-0.01952 -0.09981 0.0206
+-0.02997 -0.10564 0.02072
+-0.02026 -0.10024 0.01774
+-0.02737 -0.1042 0.01774
+-0.02382 -0.10222 0.01665
+-0.03403 -0.10787 0.0165
+-0.01949 -0.09977 0.03307
+-0.03403 -0.10787 0.03307
+-0.01949 -0.09977 0.0165
+-0.02008 -0.09871 0.03307
+-0.03462 -0.10682 0.03307
+-0.02008 -0.09871 0.0165
+-0.03462 -0.10682 0.0165
+-0.02089 -0.09783 0.01678
+-0.03495 -0.10566 0.03279
+-0.02089 -0.09783 0.03279
+-0.03495 -0.10566 0.01678
 numsurf 166
 SURF 0X10
 mat 7
@@ -379954,181 +379954,181 @@ refs 2
 kids 0
 OBJECT poly
 name "Rcutoff"
-data 12
-Rcutoff.mesh
+data 16
+Lcutoff.mesh.000
 crease 45.0
 texture "ped_xtra.png"
 texrep 1 1
 numvert 169
--0.00556 -0.13002 -0.02535
--0.00436 -0.12575 -0.02215
--0.00584 -0.13018 -0.02414
--0.00361 -0.12533 -0.02535
--0.00662 -0.13061 -0.02326
--0.00641 -0.12689 -0.01981
--0.00767 -0.1312 -0.02293
--0.00921 -0.12845 -0.01895
--0.012 -0.13001 -0.01981
--0.00873 -0.13179 -0.02326
--0.01405 -0.13115 -0.02215
--0.0095 -0.13222 -0.02414
--0.0148 -0.13157 -0.02535
--0.00979 -0.13237 -0.02535
--0.0095 -0.13222 -0.02656
--0.01405 -0.13115 -0.02856
--0.00873 -0.13179 -0.02745
--0.012 -0.13001 -0.0309
--0.00767 -0.1312 -0.02777
--0.00921 -0.12845 -0.03176
--0.00641 -0.12689 -0.0309
--0.00662 -0.13061 -0.02745
--0.00436 -0.12575 -0.02856
--0.00584 -0.13018 -0.02656
--0.00779 -0.12295 -0.0231
--0.00726 -0.12265 -0.02536
--0.00923 -0.12375 -0.02144
--0.01121 -0.12485 -0.02084
--0.01318 -0.12596 -0.02144
--0.01463 -0.12676 -0.0231
--0.01516 -0.12706 -0.02536
--0.01463 -0.12676 -0.02762
--0.01318 -0.12596 -0.02927
--0.01121 -0.12485 -0.02988
--0.00923 -0.12375 -0.02927
--0.00779 -0.12295 -0.02762
--0.00919 -0.123 -0.02383
--0.00883 -0.1228 -0.02537
--0.01017 -0.12355 -0.02271
--0.01152 -0.1243 -0.02229
--0.01286 -0.12505 -0.02271
--0.01384 -0.1256 -0.02383
--0.0142 -0.1258 -0.02537
--0.01384 -0.1256 -0.02691
--0.01286 -0.12505 -0.02803
--0.01152 -0.1243 -0.02844
--0.01017 -0.12355 -0.02803
--0.00919 -0.123 -0.02691
--0.01081 -0.11532 -0.02248
--0.01013 -0.11495 -0.02536
--0.01265 -0.11635 -0.02036
--0.01518 -0.11776 -0.01959
--0.0177 -0.11916 -0.02036
--0.01954 -0.12019 -0.02248
--0.02022 -0.12057 -0.02536
--0.01954 -0.12019 -0.02825
--0.0177 -0.11916 -0.03037
--0.01518 -0.11776 -0.03114
--0.01265 -0.11635 -0.03037
--0.01081 -0.11532 -0.02825
--0.01119 -0.11361 -0.02219
--0.01045 -0.1132 -0.02537
--0.01322 -0.11474 -0.01987
--0.01599 -0.11629 -0.01902
--0.01877 -0.11784 -0.01987
--0.0208 -0.11897 -0.02219
--0.02154 -0.11938 -0.02537
--0.0208 -0.11897 -0.02854
--0.01877 -0.11784 -0.03086
--0.01599 -0.11629 -0.03171
--0.01322 -0.11474 -0.03086
--0.01119 -0.11361 -0.02854
--0.01438 -0.10821 -0.02228
--0.01366 -0.10781 -0.02536
--0.01635 -0.10931 -0.02003
--0.01905 -0.11081 -0.0192
--0.02174 -0.11231 -0.02003
--0.02371 -0.11341 -0.02228
--0.02443 -0.11381 -0.02536
--0.02371 -0.11341 -0.02845
--0.02174 -0.11231 -0.0307
--0.01905 -0.11081 -0.03153
--0.01635 -0.10931 -0.0307
--0.01438 -0.10821 -0.02845
--0.01484 -0.108 -0.02245
--0.01416 -0.10762 -0.02536
--0.0167 -0.10904 -0.02032
--0.01924 -0.11046 -0.01954
--0.02178 -0.11188 -0.02032
--0.02365 -0.11291 -0.02245
--0.02433 -0.11329 -0.02536
--0.02365 -0.11291 -0.02828
--0.02178 -0.11188 -0.03041
--0.01924 -0.11046 -0.03119
--0.0167 -0.10904 -0.03041
--0.01484 -0.108 -0.02828
--0.01681 -0.10808 -0.02346
--0.01636 -0.10783 -0.02536
--0.01802 -0.10876 -0.02207
--0.01968 -0.10968 -0.02156
--0.02134 -0.11061 -0.02207
--0.02256 -0.11129 -0.02346
--0.023 -0.11154 -0.02536
--0.02256 -0.11129 -0.02727
--0.02134 -0.11061 -0.02866
--0.01968 -0.10968 -0.02917
--0.01802 -0.10876 -0.02866
--0.01681 -0.10808 -0.02727
--0.01812 -0.10742 -0.02394
--0.01779 -0.10723 -0.02536
--0.01904 -0.10792 -0.0229
--0.02028 -0.10862 -0.02252
--0.02152 -0.10931 -0.0229
--0.02243 -0.10982 -0.02394
--0.02276 -0.11 -0.02536
--0.02243 -0.10982 -0.02679
--0.02152 -0.10931 -0.02783
--0.02028 -0.10862 -0.02821
--0.01904 -0.10792 -0.02783
--0.01812 -0.10742 -0.02679
--0.02078 -0.10273 -0.02392
--0.02045 -0.10255 -0.02532
--0.02167 -0.10322 -0.0229
--0.02288 -0.1039 -0.02253
--0.0241 -0.10458 -0.0229
--0.02499 -0.10508 -0.02392
--0.02531 -0.10526 -0.02532
--0.02499 -0.10508 -0.02671
--0.0241 -0.10458 -0.02773
--0.02288 -0.1039 -0.0281
--0.02167 -0.10322 -0.02773
--0.02078 -0.10273 -0.02671
--0.00735 -0.13178 -0.02535
--0.02136 -0.10004 -0.02337
--0.02093 -0.0998 -0.02522
--0.02254 -0.1007 -0.02202
--0.02416 -0.1016 -0.02152
--0.02577 -0.1025 -0.02202
--0.02696 -0.10316 -0.02337
--0.02739 -0.1034 -0.02522
--0.02696 -0.10316 -0.02707
--0.02577 -0.1025 -0.02842
--0.02416 -0.1016 -0.02892
--0.02254 -0.1007 -0.02842
--0.02136 -0.10004 -0.02707
--0.02166 -0.09744 -0.01817
--0.02877 -0.10139 -0.01817
--0.02522 -0.09941 -0.01708
--0.02093 -0.09698 -0.02111
--0.03137 -0.10284 -0.02114
--0.02093 -0.09697 -0.02515
--0.03232 -0.10337 -0.02521
--0.02092 -0.09701 -0.02939
--0.03137 -0.10284 -0.02927
--0.02166 -0.09744 -0.03225
--0.02877 -0.10139 -0.03225
--0.02522 -0.09941 -0.03334
--0.03543 -0.10507 -0.03368
--0.02089 -0.09697 -0.01711
--0.03543 -0.10507 -0.01711
--0.02089 -0.09697 -0.03368
--0.02148 -0.09591 -0.01711
--0.03602 -0.10402 -0.01711
--0.02148 -0.09591 -0.03368
--0.03602 -0.10402 -0.03368
--0.02233 -0.09505 -0.03335
--0.03631 -0.10284 -0.01744
--0.02233 -0.09505 -0.01744
--0.03631 -0.10284 -0.03335
+-0.00556 -0.13002 -0.02549
+-0.00436 -0.12575 -0.02229
+-0.00584 -0.13018 -0.02428
+-0.00361 -0.12533 -0.02549
+-0.00662 -0.13061 -0.02339
+-0.00641 -0.12689 -0.01994
+-0.00767 -0.1312 -0.02307
+-0.00921 -0.12845 -0.01909
+-0.012 -0.13001 -0.01994
+-0.00873 -0.13179 -0.02339
+-0.01405 -0.13115 -0.02229
+-0.0095 -0.13222 -0.02428
+-0.0148 -0.13157 -0.02549
+-0.00979 -0.13237 -0.02549
+-0.0095 -0.13222 -0.0267
+-0.01405 -0.13115 -0.02869
+-0.00873 -0.13179 -0.02759
+-0.012 -0.13001 -0.03104
+-0.00767 -0.1312 -0.02791
+-0.00921 -0.12845 -0.0319
+-0.00641 -0.12689 -0.03104
+-0.00662 -0.13061 -0.02759
+-0.00436 -0.12575 -0.02869
+-0.00584 -0.13018 -0.0267
+-0.00779 -0.12295 -0.02323
+-0.00726 -0.12265 -0.0255
+-0.00923 -0.12375 -0.02158
+-0.01121 -0.12485 -0.02097
+-0.01318 -0.12596 -0.02158
+-0.01463 -0.12676 -0.02323
+-0.01516 -0.12706 -0.0255
+-0.01463 -0.12676 -0.02776
+-0.01318 -0.12596 -0.02941
+-0.01121 -0.12485 -0.03002
+-0.00923 -0.12375 -0.02941
+-0.00779 -0.12295 -0.02776
+-0.00919 -0.123 -0.02397
+-0.00883 -0.1228 -0.02551
+-0.01017 -0.12355 -0.02284
+-0.01152 -0.1243 -0.02243
+-0.01286 -0.12505 -0.02284
+-0.01384 -0.1256 -0.02397
+-0.0142 -0.1258 -0.02551
+-0.01384 -0.1256 -0.02704
+-0.01286 -0.12505 -0.02817
+-0.01152 -0.1243 -0.02858
+-0.01017 -0.12355 -0.02817
+-0.00919 -0.123 -0.02704
+-0.01081 -0.11532 -0.02262
+-0.01013 -0.11495 -0.0255
+-0.01265 -0.11635 -0.0205
+-0.01518 -0.11776 -0.01973
+-0.0177 -0.11916 -0.0205
+-0.01954 -0.12019 -0.02262
+-0.02022 -0.12057 -0.0255
+-0.01954 -0.12019 -0.02839
+-0.0177 -0.11916 -0.0305
+-0.01518 -0.11776 -0.03128
+-0.01265 -0.11635 -0.0305
+-0.01081 -0.11532 -0.02839
+-0.01119 -0.11361 -0.02233
+-0.01045 -0.1132 -0.0255
+-0.01322 -0.11475 -0.02
+-0.01599 -0.11629 -0.01915
+-0.01877 -0.11784 -0.02
+-0.0208 -0.11897 -0.02233
+-0.02154 -0.11938 -0.0255
+-0.0208 -0.11897 -0.02868
+-0.01877 -0.11784 -0.031
+-0.01599 -0.11629 -0.03185
+-0.01322 -0.11475 -0.031
+-0.01119 -0.11361 -0.02868
+-0.01438 -0.10821 -0.02242
+-0.01366 -0.10781 -0.0255
+-0.01635 -0.10931 -0.02016
+-0.01905 -0.11081 -0.01934
+-0.02174 -0.11231 -0.02016
+-0.02371 -0.11341 -0.02242
+-0.02443 -0.11381 -0.0255
+-0.02371 -0.11341 -0.02858
+-0.02174 -0.11231 -0.03084
+-0.01905 -0.11081 -0.03167
+-0.01635 -0.10931 -0.03084
+-0.01438 -0.10821 -0.02858
+-0.01484 -0.10801 -0.02259
+-0.01416 -0.10763 -0.0255
+-0.0167 -0.10904 -0.02046
+-0.01924 -0.11046 -0.01968
+-0.02178 -0.11188 -0.02046
+-0.02365 -0.11292 -0.02259
+-0.02433 -0.1133 -0.0255
+-0.02365 -0.11292 -0.02841
+-0.02178 -0.11188 -0.03054
+-0.01924 -0.11046 -0.03132
+-0.0167 -0.10904 -0.03054
+-0.01484 -0.10801 -0.02841
+-0.01681 -0.10808 -0.0236
+-0.01636 -0.10783 -0.0255
+-0.01802 -0.10876 -0.02221
+-0.01968 -0.10969 -0.0217
+-0.02134 -0.11061 -0.02221
+-0.02256 -0.11129 -0.0236
+-0.023 -0.11154 -0.0255
+-0.02256 -0.11129 -0.0274
+-0.02134 -0.11061 -0.0288
+-0.01968 -0.10969 -0.0293
+-0.01802 -0.10876 -0.0288
+-0.01681 -0.10808 -0.0274
+-0.01812 -0.10742 -0.02408
+-0.01779 -0.10723 -0.0255
+-0.01903 -0.10792 -0.02304
+-0.02028 -0.10862 -0.02265
+-0.02152 -0.10931 -0.02304
+-0.02243 -0.10982 -0.02408
+-0.02276 -0.11 -0.0255
+-0.02243 -0.10982 -0.02692
+-0.02152 -0.10931 -0.02797
+-0.02028 -0.10862 -0.02835
+-0.01903 -0.10792 -0.02797
+-0.01812 -0.10742 -0.02692
+-0.01938 -0.10553 -0.02406
+-0.01905 -0.10535 -0.02545
+-0.02027 -0.10603 -0.02304
+-0.02148 -0.1067 -0.02267
+-0.0227 -0.10738 -0.02304
+-0.02359 -0.10788 -0.02406
+-0.02391 -0.10806 -0.02545
+-0.02359 -0.10788 -0.02685
+-0.0227 -0.10738 -0.02786
+-0.02148 -0.1067 -0.02824
+-0.02027 -0.10603 -0.02786
+-0.01938 -0.10553 -0.02685
+-0.00735 -0.13178 -0.02549
+-0.01996 -0.10284 -0.02351
+-0.01953 -0.1026 -0.02536
+-0.02114 -0.1035 -0.02215
+-0.02276 -0.1044 -0.02166
+-0.02437 -0.1053 -0.02215
+-0.02556 -0.10596 -0.02351
+-0.02599 -0.1062 -0.02536
+-0.02556 -0.10596 -0.02721
+-0.02437 -0.1053 -0.02856
+-0.02276 -0.1044 -0.02906
+-0.02114 -0.1035 -0.02856
+-0.01996 -0.10284 -0.02721
+-0.02026 -0.10024 -0.0183
+-0.02737 -0.1042 -0.0183
+-0.02382 -0.10222 -0.01721
+-0.01953 -0.09978 -0.02124
+-0.02997 -0.10564 -0.02128
+-0.01953 -0.09977 -0.02529
+-0.03092 -0.10618 -0.02535
+-0.01952 -0.09981 -0.02953
+-0.02997 -0.10564 -0.02941
+-0.02026 -0.10024 -0.03239
+-0.02737 -0.1042 -0.03239
+-0.02382 -0.10222 -0.03348
+-0.03403 -0.10787 -0.03363
+-0.01949 -0.09977 -0.01706
+-0.03403 -0.10787 -0.01706
+-0.01949 -0.09977 -0.03363
+-0.02008 -0.09871 -0.01706
+-0.03462 -0.10682 -0.01706
+-0.02008 -0.09871 -0.03363
+-0.03462 -0.10682 -0.03363
+-0.02089 -0.09783 -0.03335
+-0.03495 -0.10566 -0.01734
+-0.02089 -0.09783 -0.01734
+-0.03495 -0.10566 -0.03335
 numsurf 166
 SURF 0X10
 mat 7
@@ -380945,6 +380945,13 @@ refs 4
 SURF 0X10
 mat 7
 refs 4
+164 0.634061 0.764246
+162 0.50671 0.764246
+166 0.512828 0.762086
+168 0.627943 0.762086
+SURF 0X10
+mat 7
+refs 4
 109 0.723479 0.793684
 119 0.720759 0.792297
 131 0.710471 0.792616
@@ -381213,73 +381220,66 @@ refs 4
 SURF 0X10
 mat 7
 refs 4
-164 0.626892 0.764246
-162 0.504196 0.764246
-166 0.510314 0.762086
-168 0.620774 0.762086
+157 0.634061 0.760429
+159 0.50671 0.760429
+162 0.50671 0.764246
+164 0.634061 0.764246
 SURF 0X10
 mat 7
 refs 4
-157 0.626892 0.760429
-159 0.504196 0.760429
-162 0.504196 0.764246
-164 0.626892 0.764246
+157 0.515068 0.876908
+164 0.515068 0.880725
+163 0.515068 0.762765
+160 0.515068 0.758942
 SURF 0X10
 mat 7
 refs 4
-157 0.511508 0.876457
-164 0.507637 0.876457
-163 0.507634 0.764239
-160 0.511509 0.764238
+161 0.511738 0.762765
+162 0.511738 0.880725
+159 0.511738 0.876908
+158 0.511738 0.758942
 SURF 0X10
 mat 7
 refs 4
-161 0.508386 0.765279
-162 0.508386 0.883239
-159 0.508386 0.879422
-158 0.508386 0.761456
+165 0.49663 0.515047
+168 0.49663 0.621305
+166 0.381514 0.621305
+167 0.381514 0.515047
 SURF 0X10
 mat 7
 refs 4
-165 0.491231 0.515047
-168 0.491231 0.618645
-166 0.380771 0.618645
-167 0.380771 0.515047
+157 0.232288 0.59531
+160 0.232288 0.528131
+158 0.159764 0.528131
+159 0.159764 0.59531
 SURF 0X10
 mat 7
 refs 4
-157 0.228416 0.594634
-160 0.228416 0.530919
-158 0.162147 0.530919
-159 0.162147 0.594634
+161 0.508613 0.857564
+163 0.508613 0.753809
+165 0.511589 0.758982
+167 0.511589 0.85239
 SURF 0X10
 mat 7
 refs 4
-161 0.50774 0.856869
-163 0.50774 0.75693
-165 0.511416 0.761914
-167 0.511416 0.851886
+163 0.515068 0.762765
+164 0.515068 0.880725
+168 0.50895 0.878565
+165 0.50895 0.772307
 SURF 0X10
 mat 7
 refs 4
-163 0.512741 0.758852
-164 0.512741 0.876812
-168 0.506623 0.874652
-165 0.506623 0.768394
+166 0.517856 0.878565
+162 0.511738 0.880725
+161 0.511738 0.762765
+167 0.517856 0.772307
 SURF 0X10
 mat 7
 refs 4
-166 0.514504 0.881079
-162 0.508386 0.883239
-161 0.508386 0.765279
-167 0.514504 0.774821
-SURF 0X10
-mat 7
-refs 4
-158 0.506267 0.856869
-160 0.506267 0.75693
-163 0.50774 0.75693
-161 0.50774 0.856869
+158 0.506093 0.857564
+160 0.506093 0.753809
+163 0.508613 0.753809
+161 0.508613 0.857564
 kids 0
 OBJECT poly
 name "Rcutoff.axis"
diff --git a/Models/FlightDeck/res/ohpanel2-tex.png b/Models/FlightDeck/res/ohpanel2-tex.png
index d2681bad..0cb4013b 100644
Binary files a/Models/FlightDeck/res/ohpanel2-tex.png and b/Models/FlightDeck/res/ohpanel2-tex.png differ
diff --git a/Models/Instruments/ND/canvas/map/RTE.lcontroller b/Models/Instruments/ND/canvas/map/RTE.lcontroller
index 342ad14d..7c4979d7 100644
--- a/Models/Instruments/ND/canvas/map/RTE.lcontroller
+++ b/Models/Instruments/ND/canvas/map/RTE.lcontroller
@@ -30,7 +30,7 @@ var new = func(layer) {
 	m.addVisibilityListener();
 	var driver = opt_member(m.layer.options, 'route_driver');
 	if(driver == nil){
-		driver = RouteDriver.new();
+		driver = A3XXRouteDriver.new();
 	}
 	var driver_listeners = driver.getListeners();
 	foreach(var listener; driver_listeners){
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index 165ad056..d3224ace 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -226,7 +226,15 @@ var update_loop = func {
 var fbw_loop = func {
 	var ail = getprop("/controls/flight/aileron");
 	
-	if (ail > 0.4 or ail < -0.4) {
+	if (ail > 0.4 and getprop("/orientation/roll-deg") >= -33.5) {
+		setprop("/it-fbw/roll-lim", "67");
+		if (getprop("/it-fbw/roll-back") == 1 and getprop("/orientation/roll-deg") <= 33.5 and getprop("/orientation/roll-deg") >= -33.5) {
+			setprop("/it-fbw/roll-back", 0);
+		}
+		if (getprop("/it-fbw/roll-back") == 0 and (getprop("/orientation/roll-deg") > 33.5 or getprop("/orientation/roll-deg") < -33.5)) {
+			setprop("/it-fbw/roll-back", 1);
+		}
+	} else if (ail < -0.4 and getprop("/orientation/roll-deg") <= 33.5) {
 		setprop("/it-fbw/roll-lim", "67");
 		if (getprop("/it-fbw/roll-back") == 1 and getprop("/orientation/roll-deg") <= 33.5 and getprop("/orientation/roll-deg") >= -33.5) {
 			setprop("/it-fbw/roll-back", 0);
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 4051bb0d..d618a1ef 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -180,8 +180,8 @@
 					<independentVar lookup="column">fbw/yaw/gain-switch</independentVar>
 					<tableData>
 						     0     1
-						0.2 -1.20  0.00
-						0.9 -0.07  0.00
+						0.2  5.01  0.00
+						0.9  1.05  0.00
 					</tableData>
 				</table>
 			</function>
@@ -194,8 +194,8 @@
 					<independentVar lookup="column">fbw/yaw/gain-switch</independentVar>
 					<tableData>
 						     0     1
-						0.2 -0.25  0.00
-						0.9 -0.19  0.00
+						0.2  1.03  0.00
+						0.9  0.79  0.00
 					</tableData>
 				</table>
 			</function>
@@ -329,7 +329,7 @@
 			</function>
 		</fcs_function>
 		
-		<fcs_function name="fbw/roll/r-r-rb">
+		<fcs_function name="fbw/roll/r-r-rb-f">
 			<function>
 				<table>
 					<independentVar lookup="row">attitude/roll-rad</independentVar>
@@ -345,6 +345,18 @@
 			</function>
 		</fcs_function>
 		
+		<switch name="fbw/roll/r-r-rb">
+			<default value="fbw/roll/r-r-rb-f"/>
+			<test logic="AND" value="fbw/roll/r-r-33">
+				attitude/roll-rad lt 0
+				fbw/roll/r-r-33 ge fbw/roll/r-r-rb-f
+			</test>
+			<test logic="AND" value="fbw/roll/r-r-33">
+				attitude/roll-rad gt 0
+				fbw/roll/r-r-33 le fbw/roll/r-r-rb-f
+			</test>
+		</switch>
+		
 		<fcs_function name="fbw/roll/r-r-os-nrb">
 			<function>
 				<sum>
@@ -1113,13 +1125,13 @@
 			<input>fbw/yaw/r-r_s-s</input>
 			<gain>fbw/yaw/yd-p-gain</gain>
 			<clipto>
-				<min>-0.2</min>
-				<max>0.2</max>
+				<min>-0.1</min>
+				<max>0.1</max>
 			</clipto>
 		</pure_gain>
 		
 		<switch name="fbw/yaw/slip-skid">
-			<default value="/instrumentation/slip-skid-ball/indicated-slip-skid"/>
+			<default value="aero/beta-rad"/>
 			<test logic="OR" value="0">
 				position/wow eq 1
 				fbw/yaw/rudder-nul gt 0
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index bae80e0d..e15a7a17 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -262,6 +262,430 @@
 		<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>/systems/thrust/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>/systems/thrust/state1</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>/systems/thrust/state1</property>
+							<value>MAN THR</value>
+						</equals>
+					</and>
+					<and>
+						<equals>
+							<property>/it-autoflight/output/athr</property>
+							<value>0</value>
+						</equals>
+						<or>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/lim-flex</property>
+									<value>0</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state1</property>
+									<value>MCT</value>
+								</equals>
+							</and>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state1</property>
+									<value>MAN THR</value>
+								</equals>
+							</and>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>CL</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MAN</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state1</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/it-autoflight/output/thr-mode</property>
+						<value>0</value>
+					</equals>
+				</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state1</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</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>/systems/thrust/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>/systems/thrust/state2</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>/systems/thrust/state2</property>
+							<value>MAN THR</value>
+						</equals>
+					</and>
+					<and>
+						<equals>
+							<property>/it-autoflight/output/athr</property>
+							<value>0</value>
+						</equals>
+						<or>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/lim-flex</property>
+									<value>0</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state2</property>
+									<value>MCT</value>
+								</equals>
+							</and>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state2</property>
+									<value>MAN THR</value>
+								</equals>
+							</and>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>CL</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MAN</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state2</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/it-autoflight/output/thr-mode</property>
+						<value>0</value>
+					</equals>
+				</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state2</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</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>
@@ -435,7 +859,7 @@
 					</or>
 				</and>
 			</condition>
-			<property>/controls/engines/engine[0]/throttle-cmd</property>
+			<property>/controls/engines/engine[0]/throttle-cmd-feed</property>
 		</input>
 		<output>
 			<property>/controls/engines/engine[0]/throttle-fdm</property>
@@ -615,7 +1039,7 @@
 					</or>
 				</and>
 			</condition>
-			<property>/controls/engines/engine[1]/throttle-cmd</property>
+			<property>/controls/engines/engine[1]/throttle-cmd-feed</property>
 		</input>
 		<output>
 			<property>/controls/engines/engine[1]/throttle-fdm</property>
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 6ab4f177..55c30662 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -643,6 +643,430 @@
 		<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>/systems/thrust/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>/systems/thrust/state1</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>/systems/thrust/state1</property>
+							<value>MAN THR</value>
+						</equals>
+					</and>
+					<and>
+						<equals>
+							<property>/it-autoflight/output/athr</property>
+							<value>0</value>
+						</equals>
+						<or>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/lim-flex</property>
+									<value>0</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state1</property>
+									<value>MCT</value>
+								</equals>
+							</and>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state1</property>
+									<value>MAN THR</value>
+								</equals>
+							</and>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>CL</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MAN</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state1</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/it-autoflight/output/thr-mode</property>
+						<value>0</value>
+					</equals>
+				</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state1</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</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>/systems/thrust/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>/systems/thrust/state2</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>/systems/thrust/state2</property>
+							<value>MAN THR</value>
+						</equals>
+					</and>
+					<and>
+						<equals>
+							<property>/it-autoflight/output/athr</property>
+							<value>0</value>
+						</equals>
+						<or>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/lim-flex</property>
+									<value>0</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state2</property>
+									<value>MCT</value>
+								</equals>
+							</and>
+							<and>
+								<equals>
+									<property>/systems/thrust/eng-out</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/systems/thrust/state2</property>
+									<value>MAN THR</value>
+								</equals>
+							</and>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>CL</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MAN</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state2</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/it-autoflight/output/thr-mode</property>
+						<value>0</value>
+					</equals>
+				</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>/systems/thrust/eng-out</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/lim-flex</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MCT</value>
+							</equals>
+						</and>
+						<and>
+							<equals>
+								<property>/systems/thrust/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>/systems/thrust/state2</property>
+								<value>MAN THR</value>
+							</equals>
+						</and>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</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>
@@ -816,7 +1240,7 @@
 					</or>
 				</and>
 			</condition>
-			<property>/controls/engines/engine[0]/throttle-cmd</property>
+			<property>/controls/engines/engine[0]/throttle-cmd-feed</property>
 		</input>
 		<output>
 			<property>/controls/engines/engine[0]/throttle-fdm</property>
@@ -996,7 +1420,7 @@
 					</or>
 				</and>
 			</condition>
-			<property>/controls/engines/engine[1]/throttle-cmd</property>
+			<property>/controls/engines/engine[1]/throttle-cmd-feed</property>
 		</input>
 		<output>
 			<property>/controls/engines/engine[1]/throttle-fdm</property>
diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml
index d50d6806..cee59197 100644
--- a/Systems/fmgc-thrust.xml
+++ b/Systems/fmgc-thrust.xml
@@ -523,17 +523,8 @@
 			</condition>
 		</enable>
 		<input>
-			<condition>
-				<equals>
-					<property>/it-autoflight/mode/thr</property>
-					<value>RETARD</value>
-				</equals>
-			</condition>
 			<value>0.0</value>
 		</input>
-		<input>
-			<property>/controls/engines/idle-limit</property>
-		</input>
 		<output>
 			<property>/controls/engines/throttle-cmd-pid</property>
 		</output>
@@ -643,7 +634,7 @@
 			</condition>
 		</enable>
 		<input>
-			<property>/controls/engines/throttle-pid-max</property>
+			<value>1.0</value>
 		</input>
 		<output>
 			<property>/controls/engines/throttle-cmd-pid</property>
@@ -750,36 +741,6 @@
 		<output>
 			<property>/controls/engines/throttle-cmd-pid</property>
 		</output>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>
-			<property>/controls/engines/throttle-pid-max</property>
-		</max>
-	</filter>
-	
-	<!-- Engine 1 -->
-	<filter>
-		<name>Thrust Filter 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>/controls/engines/throttle-cmd-pid</input>
-		<output>/controls/engines/engine[0]/throttle-cmd</output>
-		<max>
-			<property>/controls/engines/engine[0]/throttle-man</property>
-		</max>
-	</filter>
-	
-	<!-- Engine 2 -->
-	<filter>
-		<name>Thrust Filter 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>/controls/engines/throttle-cmd-pid</input>
-		<output>/controls/engines/engine[1]/throttle-cmd</output>
-		<max>
-			<property>/controls/engines/engine[1]/throttle-man</property>
-		</max>
 	</filter>
 
 </PropertyList>
diff --git a/revision.txt b/revision.txt
index 561b3919..9e2c8d60 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4412
\ No newline at end of file
+4504
\ No newline at end of file