From 722c89c27bbf7c871eded96b939ce630df64e7e0 Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 16 May 2021 18:31:08 -0400
Subject: [PATCH] Control: Start V2500

---
 A320-200-IAE.xml                             |    2 +-
 A320-main.xml                                |    7 +-
 Engines/v2527-a5_1.xml                       |   52 +-
 Engines/v2527-a5_2.xml                       |   52 +-
 Models/Instruments/OHpanel/OHpanelEPR.xml    |    8 +-
 Models/Instruments/Upper-ECAM/Upper-ECAM.nas |   14 +-
 Nasal/FMGC/FMGC-b.nas                        |    6 +-
 Nasal/Libraries/buttons.nas                  |    2 -
 Nasal/Systems/fadec-cfm.nas                  |    8 -
 Nasal/Systems/fadec-common.nas               |   10 +-
 Nasal/Systems/fadec-iae.nas                  |   28 +-
 Systems/a320-cfm56-5b4-engine-fadec.xml      |    2 +
 Systems/a320-v2527-a5-engine-fadec.xml       | 1562 ++++++++++++++++++
 Systems/upper-ecam.xml                       |  183 --
 14 files changed, 1646 insertions(+), 290 deletions(-)
 create mode 100644 Systems/a320-v2527-a5-engine-fadec.xml

diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 7d5ef0a7..9b5a776c 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -276,7 +276,7 @@
 	<system file="glass-effect"/>
 	<system file="a320-fbw"/>
 	<system file="a320-fcs"/>
-	<system file="a320-cfm56-5b4-engine-fadec"/>
+	<system file="a320-v2527-a5-engine-fadec"/>
 	<system file="a320-fuel"/>
 	<system file="a320-fwc"/>
 	<system file="a320-fwc-phases"/>
diff --git a/A320-main.xml b/A320-main.xml
index 81ad3733..129cc4aa 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -705,9 +705,11 @@
 				<clbreduc-ft type="double">1500</clbreduc-ft>
 				<control-1 n="0">
 					<detent-text type="string">IDLE</detent-text>
+					<n1-mode-sw type="bool">0</n1-mode-sw>
 				</control-1>
 				<control-2 n="0">
 					<detent-text type="string">IDLE</detent-text>
+					<n1-mode-sw type="bool">0</n1-mode-sw>
 				</control-2>
 				<eng-out type="bool">0</eng-out>
 				<limit n="0">
@@ -1321,11 +1323,6 @@
 			</sources>
 		</electrical>
 		
-		<fadec>
-			<n1mode1 type="bool">0</n1mode1>
-			<n1mode2 type="bool">0</n1mode2>
-		</fadec>
-		
 		<failures n="0">
 			<aileron-left type="bool">0</aileron-left>
 			<aileron-right type="bool">0</aileron-right>
diff --git a/Engines/v2527-a5_1.xml b/Engines/v2527-a5_1.xml
index 549a7598..d915af76 100644
--- a/Engines/v2527-a5_1.xml
+++ b/Engines/v2527-a5_1.xml
@@ -2,21 +2,21 @@
 
 <!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
 
-<turbine_engine name="CFM56-5B4">
+<turbine_engine name="V2527-A5">
 	
-	<milthrust>27000</milthrust>
+	<milthrust>26600</milthrust> <!-- @ 0.2 Mach, 24800 at 0 Mach, handled in fadec file -->
 	<tsfc>0.445</tsfc>
 	<bleed>0.03</bleed>
-	<ignitionn1>0.6</ignitionn1>
-	<ignitionn2>22.2</ignitionn2>
-	<n1spinup>0.05</n1spinup>
-	<n2spinup>1.85</n2spinup>
-	<n1startrate>0.573</n1startrate>
-	<n2startrate>1.127</n2startrate>
-	<idlen1>18.9</idlen1>
-	<idlen2>59.4</idlen2>
-	<maxn1>104.0</maxn1>
-	<maxn2>105.0</maxn2>
+	<ignitionn1>4.8</ignitionn1>
+	<ignitionn2>23.9</ignitionn2>
+	<n1spinup>0.2</n1spinup>
+	<n2spinup>1.0</n2spinup>
+	<n1startrate>0.365</n1startrate>
+	<n2startrate>1.724</n2startrate>
+	<idlen1>22.4</idlen1>
+	<idlen2>60.9</idlen2>
+	<maxn1>100.0</maxn1>
+	<maxn2>100.0</maxn2>
 	<augmented>0</augmented>
 	<injected>0</injected>
 	
@@ -50,32 +50,32 @@
 		</table>
 	</function>
 	
-	<function name="N2SpoolUp"> <!-- N1 to N2 factor 0.535840188014101 -->
+	<function name="N2SpoolUp"> <!-- N1 to N2 factor 0.503865979381443 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
 			<tableData>
 				 24   0.6
-				 28   1.6
-				 46   5.2
-				 68   8.3
-				 80  10.5
-				 94  11.5
-				103  12.6
+				 28   1.5
+				 46   4.9
+				 68   7.8
+				 80   9.9
+				 94  10.8
+				103  11.9
 			</tableData>
 		</table>
 	</function>
 	
-	<function name="N2SpoolDown"> <!-- N1 to N2 factor 0.535840188014101 -->
+	<function name="N2SpoolDown"> <!-- N1 to N2 factor 0.503865979381443 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
 			<tableData>
 				 24   0.6
-				 28   1.6
-				 46   5.2
-				 68   8.3
-				 80  10.5
-				 94  11.5
-				103  12.6
+				 28   1.5
+				 46   4.9
+				 68   7.8
+				 80   9.9
+				 94  10.8
+				103  11.9
 			</tableData>
 		</table>
 	</function>
diff --git a/Engines/v2527-a5_2.xml b/Engines/v2527-a5_2.xml
index 79c65063..f1a95966 100644
--- a/Engines/v2527-a5_2.xml
+++ b/Engines/v2527-a5_2.xml
@@ -2,21 +2,21 @@
 
 <!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
 
-<turbine_engine name="CFM56-5B4">
+<turbine_engine name="V2527-A5">
 	
-	<milthrust>27000</milthrust>
+	<milthrust>26600</milthrust> <!-- @ 0.2 Mach, 24800 at 0 Mach, handled in fadec file -->
 	<tsfc>0.445</tsfc>
 	<bleed>0.03</bleed>
-	<ignitionn1>0.6</ignitionn1>
-	<ignitionn2>22.2</ignitionn2>
-	<n1spinup>0.05</n1spinup>
-	<n2spinup>1.85</n2spinup>
-	<n1startrate>0.573</n1startrate>
-	<n2startrate>1.127</n2startrate>
-	<idlen1>18.9</idlen1>
-	<idlen2>59.4</idlen2>
-	<maxn1>104.0</maxn1>
-	<maxn2>105.0</maxn2>
+	<ignitionn1>4.8</ignitionn1>
+	<ignitionn2>23.9</ignitionn2>
+	<n1spinup>0.2</n1spinup>
+	<n2spinup>1.0</n2spinup>
+	<n1startrate>0.365</n1startrate>
+	<n2startrate>1.724</n2startrate>
+	<idlen1>22.4</idlen1>
+	<idlen2>60.9</idlen2>
+	<maxn1>100.0</maxn1>
+	<maxn2>100.0</maxn2>
 	<augmented>0</augmented>
 	<injected>0</injected>
 	
@@ -50,32 +50,32 @@
 		</table>
 	</function>
 	
-	<function name="N2SpoolUp"> <!-- N1 to N2 factor 0.535840188014101 -->
+	<function name="N2SpoolUp"> <!-- N1 to N2 factor 0.503865979381443 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
 			<tableData>
 				 24   0.6
-				 28   1.6
-				 46   5.2
-				 68   8.3
-				 80  10.5
-				 94  11.5
-				103  12.6
+				 28   1.5
+				 46   4.9
+				 68   7.8
+				 80   9.9
+				 94  10.8
+				103  11.9
 			</tableData>
 		</table>
 	</function>
 	
-	<function name="N2SpoolDown"> <!-- N1 to N2 factor 0.535840188014101 -->
+	<function name="N2SpoolDown"> <!-- N1 to N2 factor 0.503865979381443 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
 			<tableData>
 				 24   0.6
-				 28   1.6
-				 46   5.2
-				 68   8.3
-				 80  10.5
-				 94  11.5
-				103  12.6
+				 28   1.5
+				 46   4.9
+				 68   7.8
+				 80   9.9
+				 94  10.8
+				103  11.9
 			</tableData>
 		</table>
 	</function>
diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index 8a0f0cfe..6bd18519 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -53,7 +53,7 @@
 					</and>
 				</condition>
 				<command>property-toggle</command>
-				<property>controls/fadec/n1mode1</property>
+				<property>fdm/jsbsim/fadec/control-1/n1-mode-sw</property>
 			</binding>
 			<binding>
 				<command>property-assign</command>
@@ -116,7 +116,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>controls/fadec/n1mode1</property>
+					<property>fdm/jsbsim/fadec/control-1/n1-mode-sw</property>
 					<value>1</value>
 				</equals>
 				<equals>
@@ -154,7 +154,7 @@
 					</and>
 				</condition>
 				<command>property-toggle</command>
-				<property>controls/fadec/n1mode2</property>
+				<property>fdm/jsbsim/fadec/control-2/n1-mode-sw</property>
 			</binding>
 			<binding>
 				<command>property-assign</command>
@@ -217,7 +217,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>controls/fadec/n1mode2</property>
+					<property>fdm/jsbsim/fadec/control-2/n1-mode-sw</property>
 					<value>1</value>
 				</equals>
 				<equals>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 78b4b04f..cd1ca51d 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -1019,13 +1019,13 @@ input = {
 	egt_2_needle: "/instrumentation/upper-ecam/egt[1]",
 	
 	# N1 parameters
-	EPR_1: "/ECAM/Upper/EPR[0]",
-	EPR_2: "/ECAM/Upper/EPR[1]",
+	EPR_1: "/instrumentation/upper-ecam/epr[0]",
+	EPR_2: "/instrumentation/upper-ecam/epr[1]",
 	EPR_actual_1: "/engines/engine[0]/epr-actual",
 	EPR_actual_2: "/engines/engine[1]/epr-actual",
-	EPR_lim: "/ECAM/Upper/EPRylim",
-	EPRthr_1: "/ECAM/Upper/EPRthr[0]",
-	EPRthr_2: "/ECAM/Upper/EPRthr[1]",
+	EPR_lim: "/instrumentation/upper-ecam/epr-limit",
+	EPRthr_1: "/instrumentation/upper-ecam/epr-thr[0]",
+	EPRthr_2: "/instrumentation/upper-ecam/epr-thr[1]",
 	
 	# fuel flow
 	fuelflow_1: "/engines/engine[0]/ff-actual",
@@ -1051,8 +1051,8 @@ input = {
 	fadecPower1: "/systems/fadec/powered1",
 	fadecPower2: "/systems/fadec/powered2",
 	fadecPowerStart: "/systems/fadec/powerup",
-	N1_mode_1: "/fdm/jsbsim/fadec/control-1/n1-mode",
-	N1_mode_2: "/fdm/jsbsim/fadec/control-2/n1-mode",
+	N1_mode_1: "/fdm/jsbsim/fadec/control-1/n1-mode-sw",
+	N1_mode_2: "/fdm/jsbsim/fadec/control-2/n1-mode-sw",
 	eng1_epr: "/systems/fadec/eng1/epr",
 	eng2_epr: "/systems/fadec/eng2/epr",
 	eng1_n1: "/systems/fadec/eng1/n1",
diff --git a/Nasal/FMGC/FMGC-b.nas b/Nasal/FMGC/FMGC-b.nas
index 07c6892f..4344c76b 100644
--- a/Nasal/FMGC/FMGC-b.nas
+++ b/Nasal/FMGC/FMGC-b.nas
@@ -355,6 +355,10 @@ var ITAF = {
 				fcu.apOff("hard", 0);
 			}
 		}
+		
+		if ((systems.FADEC.n1Mode[0].getValue() > 0 or systems.FADEC.n1Mode[1].getValue() > 0) and Output.athr.getBoolValue()) {
+			fcu.athrOff("hard");
+		}
 	},
 	slowLoop: func() {
 		Velocities.trueAirspeedKtTemp = Velocities.trueAirspeedKt.getValue();
@@ -476,7 +480,7 @@ var ITAF = {
 	},
 	athrMaster: func(s) {
 		if (s == 1) {
-			if (systems.ELEC.Bus.acEss.getValue() >= 110 and !pts.FMGC.CasCompare.casRejectAll.getBoolValue() and fbw.FBW.apOff == 0) {
+			if (systems.ELEC.Bus.acEss.getValue() >= 110 and !pts.FMGC.CasCompare.casRejectAll.getBoolValue() and fbw.FBW.apOff == 0 and systems.FADEC.n1Mode[0].getValue() == 0 and systems.FADEC.n1Mode[1].getValue() == 0) {
 				Output.athr.setBoolValue(1);
 				Custom.ThrLock.setValue(0);
 				Custom.Sound.enableAthrOff = 1;
diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas
index a7b2588f..2decb374 100644
--- a/Nasal/Libraries/buttons.nas
+++ b/Nasal/Libraries/buttons.nas
@@ -14,8 +14,6 @@ var cvr_tone = props.globals.getNode("/controls/CVR/tone");
 var variousReset = func() {
 	setprop("/modes/cpt-du-xfr", 0);
 	setprop("/modes/fo-du-xfr", 0);
-	setprop("/controls/fadec/n1mode1", 0);
-	setprop("/controls/fadec/n1mode2", 0);
 	setprop("/instrumentation/mk-viii/serviceable", 1);
 	setprop("/instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit", 0);
 	setprop("/instrumentation/mk-viii/inputs/discretes/gpws-inhibit", 0);
diff --git a/Nasal/Systems/fadec-cfm.nas b/Nasal/Systems/fadec-cfm.nas
index dc34cdb2..f0fd2d66 100644
--- a/Nasal/Systems/fadec-cfm.nas
+++ b/Nasal/Systems/fadec-cfm.nas
@@ -43,14 +43,6 @@ var FADEC_S = {
 		n2: 0,
 		ff: 0,
 	},
-	Switches: {
-		n1ModeSwitch1: props.globals.initNode("/controls/fadec/n1mode1", 0, "BOOL"),
-		n1ModeSwitch2: props.globals.initNode("/controls/fadec/n1mode2", 0, "BOOL"),
-	},
-	Modes: {
-		n1Mode1: props.globals.initNode("/fdm/jsbsim/fadec/control-1/n1-mode", 0, "BOOL"),  # 0 == EPR, 1 == N1 Rated, 2 == N1 Unrated #
-		n1Mode2: props.globals.initNode("/fdm/jsbsim/fadec/control-2/n1-mode", 0, "BOOL"),
-	},
 	init: func() {
 		me.Power.poweredTime.setValue(-300);
 		me.Eng1.eng1Time.setValue(-300);
diff --git a/Nasal/Systems/fadec-common.nas b/Nasal/Systems/fadec-common.nas
index e2c8b3a2..22012820 100644
--- a/Nasal/Systems/fadec-common.nas
+++ b/Nasal/Systems/fadec-common.nas
@@ -39,6 +39,7 @@ var FADEC = {
 	manThrAboveMct: [0, 0],
 	maxDetent: props.globals.getNode("/fdm/jsbsim/fadec/max-detent"),
 	n1Mode: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/n1-mode"), props.globals.getNode("/fdm/jsbsim/fadec/control-2/n1-mode")],
+	n1ModeSw: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/n1-mode-sw"), props.globals.getNode("/fdm/jsbsim/fadec/control-2/n1-mode-sw")],
 	togaLk: props.globals.getNode("/fdm/jsbsim/fadec/toga-lk"),
 	init: func() {
 		me.engOut.setBoolValue(0);
@@ -46,6 +47,13 @@ var FADEC = {
 		me.Limit.activeModeInt.setValue(0);
 		me.Limit.flexActive.setBoolValue(0);
 		me.Limit.flexActiveCmd.setBoolValue(0);
+		if (pts.Options.eng.getValue() == "IAE") {
+			me.n1ModeSw[0].setBoolValue(1);
+			me.n1ModeSw[1].setBoolValue(1);
+		} else {
+			me.n1ModeSw[0].setBoolValue(0);
+			me.n1ModeSw[1].setBoolValue(0);
+		}
 		systems.FADEC_S.init();
 		thrustFlashT.start();
 	},
@@ -117,7 +125,7 @@ var FADEC = {
 		pts.Gear.wowTemp[1] = pts.Gear.wow[1].getValue();
 		pts.Gear.wowTemp[2] = pts.Gear.wow[2].getValue();
 		
-		if (me.Limit.flexActiveCmd.getBoolValue() and !me.n1Mode[0].getValue() and !me.n1Mode[1].getValue() and pts.Gear.wowTemp[1] and pts.Gear.wowTemp[2] and pts.Velocities.groundspeedKt.getValue() < 40 and (pts.Engines.Engine.stateTemp[0] == 3 or pts.Engines.Engine.stateTemp[1] == 3)) {
+		if (me.Limit.flexActiveCmd.getBoolValue() and me.n1Mode[0].getValue() == 0 and me.n1Mode[1].getValue() == 0 and pts.Gear.wowTemp[1] and pts.Gear.wowTemp[2] and pts.Velocities.groundspeedKt.getValue() < 40 and (pts.Engines.Engine.stateTemp[0] == 3 or pts.Engines.Engine.stateTemp[1] == 3)) {
 			if (!me.Limit.flexActive.getBoolValue()) {
 				me.Limit.flexActive.setBoolValue(1);
 			}
diff --git a/Nasal/Systems/fadec-iae.nas b/Nasal/Systems/fadec-iae.nas
index b6717b0e..b09b31f2 100644
--- a/Nasal/Systems/fadec-iae.nas
+++ b/Nasal/Systems/fadec-iae.nas
@@ -43,14 +43,6 @@ var FADEC_S = {
 		n2: 0,
 		ff: 0,
 	},
-	Switches: {
-		n1ModeSwitch1: props.globals.initNode("/controls/fadec/n1mode1", 0, "BOOL"),
-		n1ModeSwitch2: props.globals.initNode("/controls/fadec/n1mode2", 0, "BOOL"),
-	},
-	Modes: {
-		n1Mode1: props.globals.initNode("/fdm/jsbsim/fadec/control-1/n1-mode", 0, "BOOL"),  # 0 == EPR, 1 == N1 Rated, 2 == N1 Unrated #
-		n1Mode2: props.globals.initNode("/fdm/jsbsim/fadec/control-2/n1-mode", 0, "BOOL"),
-	},
 	init: func() {
 		me.Power.poweredTime.setValue(-300);
 		me.Eng1.eng1Time.setValue(-300);
@@ -146,7 +138,7 @@ var FADEC_S = {
 		powerup = me.Power.powerup.getValue();
 		
 		if (powered1 or powerup or me.Eng1.eng1Off.getValue()) {
-			if (me.Modes.n1Mode1.getValue() == 0) {
+			if (FADEC.n1Mode[0].getValue() == 0) {
 				me.Eng1.epr.setValue(1);
 			} else {
 				me.Eng1.epr.setValue(0);
@@ -160,7 +152,7 @@ var FADEC_S = {
 		}
 		
 		if (powered2 or powerup or me.Eng2.eng2Off.getValue()) {
-			if (me.Modes.n1Mode2.getValue() == 0) {
+			if (FADEC.n1Mode[1].getValue() == 0) {
 				me.Eng2.epr.setValue(1);
 			} else {
 				me.Eng2.epr.setValue(0);
@@ -203,19 +195,3 @@ var FADEC_S = {
 		}
 	},
 };
-
-setlistener("/controls/fadec/n1mode1", func() {
-	if (FADEC.Switches.n1ModeSwitch1.getValue()) {
-		FADEC.Modes.n1Mode1.setValue(1);
-	} else {
-		FADEC.Modes.n1Mode1.setValue(0);
-	}
-}, 0, 0);
-
-setlistener("/controls/fadec/n1mode2", func() {
-	if (FADEC.Switches.n1ModeSwitch2.getValue()) {
-		FADEC.Modes.n1Mode2.setValue(1);
-	} else {
-		FADEC.Modes.n1Mode2.setValue(0);
-	}
-}, 0, 0);
\ No newline at end of file
diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index 159a8f00..f17f0443 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -12,6 +12,8 @@
 	<property value="104">fadec/limit/max-n1</property>
 	<property value="0">fadec/athr/cmd</property>
 	<property value="1">fadec/limit/active-epr</property> <!-- Unused in this engine -->
+	<property value="0">fadec/control-1/n1-mode</property> <!-- Unused in this engine -->
+	<property value="0">fadec/control-2/n1-mode</property> <!-- Unused in this engine -->
 	
 	<channel name="Thrust Limits">
 		
diff --git a/Systems/a320-v2527-a5-engine-fadec.xml b/Systems/a320-v2527-a5-engine-fadec.xml
new file mode 100644
index 00000000..fce0d230
--- /dev/null
+++ b/Systems/a320-v2527-a5-engine-fadec.xml
@@ -0,0 +1,1562 @@
+<?xml version="1.0"?>
+
+<!-- Airbus A320 V2527-A5 Engine -->
+<!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
+
+<system name="A320: V2500 Engine">
+	
+	<property value="46">fadec/limit/rated-temp</property>
+	<property value="30">fadec/limit/flex-rated-temp</property>
+	<property value="26600">fadec/limit/rated-thrust</property>
+	<property value="22.4">fadec/limit/min-n1</property>
+	<property value="100">fadec/limit/max-n1</property>
+	<property value="0">fadec/athr/cmd</property>
+	<property value="1">fadec/limit/active-epr</property> <!-- Unused in this engine -->
+	
+	<channel name="Thrust Limits">
+		
+		<switch name="fadec/control-1/n1-mode">
+			<default value="0"/> <!-- EPR -->
+			<test value="1"> <!-- N1 Rated -->
+				fadec/control-1/n1-mode-sw eq 1
+			</test>
+			<!--test value="2"> N1 Unrated
+			</test-->
+		</switch>
+		
+		<switch name="fadec/control-2/n1-mode">
+			<default value="0"/> <!-- EPR -->
+			<test value="1"> <!-- N1 Rated -->
+				fadec/control-2/n1-mode-sw eq 1
+			</test>
+			<!--test value="2"> N1 Unrated
+			</test-->
+		</switch>
+		
+		<fcs_function name="fadec/limit/rated-thrust-n1">
+			<function>
+				<table>
+					<independentVar lookup="row">/position/altitude-ft</independentVar>
+					<independentVar lookup="column">propulsion/tat-c</independentVar>
+					<tableData>
+						      -44   -14    16    46    76
+						    0  77.7  82.3  86.5  90.7   94.8
+						10000  87.3  91.6  95.5  96.9   95.7
+						43000  86.0  86.4  91.1  99.3  100.3
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/milthrust-unmodified"> <!-- Copy of MilThrust table in engines file -->
+			<function>
+				<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>
+		</fcs_function>
+		
+		<!-- Following functions fix a FGTurbine inaccuracy... rated thrust N1% should be rated thrust lbs -->
+		<!-- These calculations change it so that the rated power at sea level is at the correct N1% value. It still changes with altitude and mach as it should -->
+		<fcs_function name="fadec/limit/fgturbine-thrust-lbs">
+			<function>
+				<sum>
+					<product>
+						<property>propulsion/engine[0]/IdleThrust</property> <!-- It doesn't matter which engine, its same for all -->
+						<property>fadec/limit/rated-thrust</property>
+					</product>
+					<product>
+						<difference>
+							<property>fadec/limit/rated-thrust</property>
+							<product>
+								<property>propulsion/engine[0]/IdleThrust</property> <!-- It doesn't matter which engine, its same for all -->
+								<property>fadec/limit/rated-thrust</property>
+							</product>
+						</difference>
+						<property>fadec/limit/milthrust-unmodified</property>
+					</product>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/rated-thrust-lbs">
+			<function>
+				<sum>
+					<product>
+						<property>propulsion/engine[0]/IdleThrust</property> <!-- It doesn't matter which engine, its same for all -->
+						<property>fadec/limit/rated-thrust</property>
+					</product>
+					<product>
+						<product>
+							<difference>
+								<property>fadec/limit/rated-thrust</property>
+								<product>
+									<property>propulsion/engine[0]/IdleThrust</property> <!-- It doesn't matter which engine, its same for all -->
+									<property>fadec/limit/rated-thrust</property>
+								</product>
+							</difference>
+							<property>fadec/limit/milthrust-unmodified</property>
+						</product>
+						<quotient>
+							<difference>
+								<property>fadec/limit/rated-thrust-n1</property>
+								<value>22.4</value>
+							</difference>
+							<value>77.6</value>
+						</quotient>
+						<quotient>
+							<difference>
+								<property>fadec/limit/rated-thrust-n1</property>
+								<value>22.4</value>
+							</difference>
+							<value>77.6</value>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/rated-thrust-factor"> <!-- Normalize -->
+			<function>
+				<ifthen>
+					<eq>
+						<property>/systems/acconfig/autoconfig-running</property>
+						<value>1</value>
+					</eq>
+					<value>0</value>
+					<ifthen>
+						<nq> <!-- Prevent divide by 0 -->
+							<property>fadec/limit/rated-thrust-lbs</property>
+							<value>0</value>
+						</nq>
+						<quotient>
+							<property>fadec/limit/fgturbine-thrust-lbs</property>
+							<property>fadec/limit/rated-thrust-lbs</property>
+						</quotient>
+						<value>1</value>
+					</ifthen>
+				</ifthen>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/toga-ref">
+			<function>
+				<table>
+					<independentVar lookup="row">/position/altitude-ft</independentVar>
+					<independentVar lookup="column">propulsion/tat-c</independentVar>
+					<tableData>
+						      -44   -14    16    46    76
+						    0  77.7  82.3  86.5  90.7  86.4
+						10000  87.3  91.6  95.5  96.9  92.9
+						43000  86.0  86.4  91.1  99.3  93.8
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/toga">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/toga-ref</property>
+								<value>10</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>10</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/toga-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/toga</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<summer name="fadec/limit/flex-temp-input"> <!-- (Rated - Flex) + TAT -->
+			<input>fadec/limit/flex-rated-temp</input> <!-- Fix the calculations -->
+			<input>-fadec/limit/flex-temp</input>
+			<input>propulsion/tat-c</input>
+		</summer>
+		
+		<fcs_function name="fadec/limit/flex-ref">
+			<function>
+				<min> <!-- FLEX can not increase thrust past TOGA -->
+					<property>fadec/limit/toga-ref</property>
+					<table>
+						<independentVar lookup="row">/position/altitude-ft</independentVar>
+						<independentVar lookup="column">fadec/limit/flex-temp-input</independentVar>
+						<tableData>
+							      -44   -14    16    46    76
+								0  77.7  82.3  86.5  90.7  86.4
+							10000  87.3  91.6  95.5  96.9  92.9
+							43000  86.0  86.4  91.1  99.3  93.8
+						</tableData>
+					</table>
+				</min>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mct-ref">
+			<function>
+				<table>
+					<independentVar lookup="row">/position/altitude-ft</independentVar>
+					<independentVar lookup="column">propulsion/tat-c</independentVar>
+					<tableData>
+						      -65   -35   -5     25    55
+						    0  71.9  76.3  80.6  84.6  83.1
+						10000  81.3  85.4  89.3  92.2  91.7
+						43000  82.6  82.9  84.7  89.1  87.5
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<switch name="fadec/limit/mct-flex-ref">
+			<default value="fadec/limit/mct-ref"/>
+			<test value="fadec/limit/flex-ref">
+				fadec/limit/flex-active eq 1
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/limit/mct">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/mct-flex-ref</property>
+								<value>10</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>10</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mct-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/mct</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/climb-ref">
+			<function>
+				<table>
+					<independentVar lookup="row">/position/altitude-ft</independentVar>
+					<independentVar lookup="column">propulsion/tat-c</independentVar>
+					<tableData>
+						      -65   -35   -5     25    55
+						    0  69.3  73.5  77.5  81.3  79.9
+						10000  78.2  82.0  85.8  88.5  87.3
+						43000  79.4  79.8  81.4  85.5  84.0
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/climb">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/climb-ref</property>
+								<value>10</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>10</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/climb-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/climb</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/idle-ref">
+			<function>
+				<ifthen>
+					<eq>
+						<property>position/wow</property>
+						<value>0</value>
+					</eq>
+					<table>
+						<independentVar lookup="row">velocities/mach</independentVar>
+						<independentVar lookup="column">/controls/flight/flaps-input</independentVar>
+						<independentVar lookup="table">/position/altitude-ft</independentVar>
+						<tableData breakPoint="0">
+							      0     1
+							0.21  27.9  33.6
+							0.70  35.3  39.7
+						</tableData>
+						<tableData breakPoint="43000">
+							      0     1
+							0.55  44.2  50.0
+							0.90  49.7  51.8
+						</tableData>
+					</table>
+					<value>0</value>
+				</ifthen>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/idle">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/idle-ref</property>
+								<value>10</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>10</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/idle-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/idle</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mrev-ref">
+			<function>
+				<table>
+					<independentVar lookup="row">/position/altitude-ft</independentVar>
+					<independentVar lookup="column">propulsion/tat-c</independentVar>
+					<tableData>
+						      -65   -35   -5     25    55
+						    0  62.1  65.5  68.9  72.2  71.0
+						10000  69.5  72.8  75.9  78.3  77.8
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mrev">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/mrev-ref</property>
+								<value>10</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>10</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mrev-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/mrev</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+	
+	</channel>
+	
+	<channel name="Reversers">
+		
+		<!-- Engine 1 -->
+		<switch name="fadec/reverse-1/position-cmd">
+			<default value="0"/>
+			<test value="1">
+				/controls/engines/engine[0]/reverse-lever ge 0.25
+			</test>
+			<output>/controls/engines/engine[0]/reverse-cmd</output>
+		</switch>
+		
+		<switch name="fadec/reverse-1/position-rate">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/hydraulic/green-psi ge 1500
+				/systems/acconfig/autoconfig-running eq 1
+			</test>
+		</switch>
+		
+		<actuator name="fadec/reverse-1/position-norm">
+			<input>fadec/reverse-1/position-cmd</input>
+			<rate_limit>fadec/reverse-1/position-rate</rate_limit>
+			<output>/engines/engine[0]/reverser-pos-norm</output>
+		</actuator>
+		
+		<pure_gain name="propulsion/engine[0]/reverser-angle-rad">
+			<input>fadec/reverse-1/position-norm</input>
+			<gain>3.14</gain>
+		</pure_gain>
+		
+		<fcs_function name="fadec/reverse-1/throttle-rev">
+			<function>
+				<sum>
+					<value>0.08</value>
+					<product>
+						<difference>
+							<property>/controls/engines/engine[0]/reverse-lever</property>
+							<value>0.25</value>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/mrev-norm</property>
+								<value>0.08</value>
+							</difference>
+							<value>0.75</value> <!-- 1.0 - 0.25 -->
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>0.08</min>
+				<max>fadec/limit/mrev-norm</max>
+			</clipto>
+		</fcs_function>
+		
+		<!-- Engine 2 -->
+		<switch name="fadec/reverse-2/position-cmd">
+			<default value="0"/>
+			<test value="1">
+				/controls/engines/engine[1]/reverse-lever ge 0.25
+			</test>
+			<output>/controls/engines/engine[1]/reverse-cmd</output>
+		</switch>
+		
+		<switch name="fadec/reverse-2/position-rate">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/hydraulic/yellow-psi ge 1500
+				/systems/acconfig/autoconfig-running eq 1
+			</test>
+		</switch>
+		
+		<actuator name="fadec/reverse-2/position-norm">
+			<input>fadec/reverse-2/position-cmd</input>
+			<rate_limit>fadec/reverse-2/position-rate</rate_limit>
+			<output>/engines/engine[1]/reverser-pos-norm</output>
+		</actuator>
+		
+		<pure_gain name="propulsion/engine[1]/reverser-angle-rad">
+			<input>fadec/reverse-2/position-norm</input>
+			<gain>3.14</gain>
+		</pure_gain>
+		
+		<fcs_function name="fadec/reverse-2/throttle-rev">
+			<function>
+				<sum>
+					<value>0.08</value>
+					<product>
+						<difference>
+							<property>/controls/engines/engine[1]/reverse-lever</property>
+							<value>0.25</value>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/mrev-norm</property>
+								<value>0.08</value>
+							</difference>
+							<value>0.75</value> <!-- 1.0 - 0.25 -->
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>0.08</min>
+				<max>fadec/limit/mrev-norm</max>
+			</clipto>
+		</fcs_function>
+	
+	</channel>
+	
+	<channel name="Engine Control"> <!-- Very complicated, please don't touch if you don't understand it -->
+		
+		<!-- Engine 1 -->
+		<lag_filter name="fadec/control-1/throttle-lag">
+			<input>/controls/engines/engine[0]/throttle</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<switch name="fadec/control-1/throttle-pos">
+			<default value="fadec/control-1/throttle-lag"/>
+			<test value="0">
+				fadec/reverse-1/position-norm ne 0
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/control-1/idle-climb-n1">
+			<function>
+				<sum>
+					<property>fadec/limit/min-n1</property>
+					<product>
+						<difference>
+							<property>fadec/control-1/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/idle-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/climb</property>
+								<property>fadec/limit/min-n1</property>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/climb-b</property>
+								<property>/systems/acconfig/options/fadec/idle-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>fadec/limit/min-n1</min>
+				<max>fadec/limit/climb</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-1/climb-mct-n1">
+			<function>
+				<sum>
+					<property>fadec/limit/climb</property>
+					<product>
+						<difference>
+							<property>fadec/control-1/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/climb-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/mct</property>
+								<property>fadec/limit/climb</property>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/mct-b</property>
+								<property>/systems/acconfig/options/fadec/climb-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>fadec/limit/climb</min>
+				<max>fadec/limit/mct</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-1/mct-toga-n1">
+			<function>
+				<sum>
+					<property>fadec/limit/mct</property>
+					<product>
+						<difference>
+							<property>fadec/control-1/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/mct-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/toga</property>
+								<property>fadec/limit/mct</property>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/toga-b</property>
+								<property>/systems/acconfig/options/fadec/mct-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>fadec/limit/mct</min>
+				<max>fadec/limit/toga</max>
+			</clipto>
+		</fcs_function>
+		
+		<switch name="fadec/control-1/lever-n1">
+			<default value="fadec/control-1/idle-climb-n1"/>
+			<test value="fadec/control-1/mct-toga-n1">
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+			</test>
+			<test value="fadec/control-1/climb-mct-n1">
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/control-1/lever-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/control-1/lever-n1</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<switch name="fadec/control-1/detent">
+			<default value="0"/> <!-- IDLE -->
+			<test value="6"> <!-- TOGA -->
+				fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+			</test>
+			<test value="5"> <!-- MAN THR -->
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+			</test>
+			<test value="4"> <!-- MCT/FLX -->
+				fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+			</test>
+			<test value="3"> <!-- MAN THR -->
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+			</test>
+			<test value="2"> <!-- CL -->
+				fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+			</test>
+			<test value="1"> <!-- MAN -->
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/control-1/lever/idle-climb">
+			<function>
+				<sum>
+					<value>2</value>
+					<product>
+						<difference>
+							<property>fadec/control-1/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/idle-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<value>23</value>
+								<value>2</value>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/climb-b</property>
+								<property>/systems/acconfig/options/fadec/idle-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>2</min>
+				<max>23</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-1/lever/climb-mct">
+			<function>
+				<sum>
+					<value>27</value>
+					<product>
+						<difference>
+							<property>fadec/control-1/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/climb-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<value>33</value>
+								<value>27</value>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/mct-b</property>
+								<property>/systems/acconfig/options/fadec/climb-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>27</min>
+				<max>33</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-1/lever/mct-toga">
+			<function>
+				<sum>
+					<value>37</value>
+					<product>
+						<difference>
+							<property>fadec/control-1/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/mct-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<value>43</value>
+								<value>37</value>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/toga-b</property>
+								<property>/systems/acconfig/options/fadec/mct-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>37</min>
+				<max>43</max>
+			</clipto>
+		</fcs_function>
+		
+		<switch name="fadec/control-1/lever/angle">
+			<default value="0"/> <!-- IDLE -->
+			<test value="45"> <!-- TOGA -->
+				fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+			</test>
+			<test value="fadec/control-1/lever/mct-toga"> <!-- MAN THR -->
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+			</test>
+			<test value="35"> <!-- MCT/FLX -->
+				fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+			</test>
+			<test value="fadec/control-1/lever/climb-mct"> <!-- MAN THR -->
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+			</test>
+			<test value="25"> <!-- CL -->
+				fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+			</test>
+			<test value="fadec/control-1/lever/idle-climb"> <!-- MAN -->
+				fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+			</test>
+		</switch>
+		
+		<!-- Engine 2 -->
+		<lag_filter name="fadec/control-2/throttle-lag">
+			<input>/controls/engines/engine[1]/throttle</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<switch name="fadec/control-2/throttle-pos">
+			<default value="fadec/control-2/throttle-lag"/>
+			<test value="0">
+				fadec/reverse-2/position-norm ne 0
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/control-2/idle-climb-n1">
+			<function>
+				<sum>
+					<property>fadec/limit/min-n1</property>
+					<product>
+						<difference>
+							<property>fadec/control-2/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/idle-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/climb</property>
+								<property>fadec/limit/min-n1</property>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/climb-b</property>
+								<property>/systems/acconfig/options/fadec/idle-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>fadec/limit/min-n1</min>
+				<max>fadec/limit/climb</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-2/climb-mct-n1">
+			<function>
+				<sum>
+					<property>fadec/limit/climb</property>
+					<product>
+						<difference>
+							<property>fadec/control-2/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/climb-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/mct</property>
+								<property>fadec/limit/climb</property>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/mct-b</property>
+								<property>/systems/acconfig/options/fadec/climb-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>fadec/limit/climb</min>
+				<max>fadec/limit/mct</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-2/mct-toga-n1">
+			<function>
+				<sum>
+					<property>fadec/limit/mct</property>
+					<product>
+						<difference>
+							<property>fadec/control-2/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/mct-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<property>fadec/limit/toga</property>
+								<property>fadec/limit/mct</property>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/toga-b</property>
+								<property>/systems/acconfig/options/fadec/mct-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>fadec/limit/mct</min>
+				<max>fadec/limit/toga</max>
+			</clipto>
+		</fcs_function>
+		
+		<switch name="fadec/control-2/lever-n1">
+			<default value="fadec/control-2/idle-climb-n1"/>
+			<test value="fadec/control-2/mct-toga-n1">
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+			</test>
+			<test value="fadec/control-2/climb-mct-n1">
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/control-2/lever-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/control-2/lever-n1</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<switch name="fadec/control-2/detent">
+			<default value="0"/> <!-- IDLE -->
+			<test value="6"> <!-- TOGA -->
+				fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+			</test>
+			<test value="5"> <!-- MAN THR -->
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+			</test>
+			<test value="4"> <!-- MCT/FLX -->
+				fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+			</test>
+			<test value="3"> <!-- MAN THR -->
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+			</test>
+			<test value="2"> <!-- CL -->
+				fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+			</test>
+			<test value="1"> <!-- MAN -->
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+			</test>
+		</switch>
+		
+		<fcs_function name="fadec/control-2/lever/idle-climb">
+			<function>
+				<sum>
+					<value>2</value>
+					<product>
+						<difference>
+							<property>fadec/control-2/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/idle-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<value>23</value>
+								<value>2</value>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/climb-b</property>
+								<property>/systems/acconfig/options/fadec/idle-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>2</min>
+				<max>23</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-2/lever/climb-mct">
+			<function>
+				<sum>
+					<value>27</value>
+					<product>
+						<difference>
+							<property>fadec/control-2/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/climb-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<value>33</value>
+								<value>27</value>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/mct-b</property>
+								<property>/systems/acconfig/options/fadec/climb-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>27</min>
+				<max>33</max>
+			</clipto>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-2/lever/mct-toga">
+			<function>
+				<sum>
+					<value>37</value>
+					<product>
+						<difference>
+							<property>fadec/control-2/throttle-pos</property>
+							<property>/systems/acconfig/options/fadec/mct-t</property>
+						</difference>
+						<quotient>
+							<difference>
+								<value>43</value>
+								<value>37</value>
+							</difference>
+							<difference>
+								<property>/systems/acconfig/options/fadec/toga-b</property>
+								<property>/systems/acconfig/options/fadec/mct-t</property>
+							</difference>
+						</quotient>
+					</product>
+				</sum>
+			</function>
+			<clipto>
+				<min>37</min>
+				<max>43</max>
+			</clipto>
+		</fcs_function>
+		
+		<switch name="fadec/control-2/lever/angle">
+			<default value="0"/> <!-- IDLE -->
+			<test value="45"> <!-- TOGA -->
+				fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+			</test>
+			<test value="fadec/control-2/lever/mct-toga"> <!-- MAN THR -->
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+			</test>
+			<test value="35"> <!-- MCT/FLX -->
+				fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+			</test>
+			<test value="fadec/control-2/lever/climb-mct"> <!-- MAN THR -->
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+			</test>
+			<test value="25"> <!-- CL -->
+				fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+			</test>
+			<test value="fadec/control-2/lever/idle-climb"> <!-- MAN -->
+				fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+			</test>
+		</switch>
+		
+		<!-- Alpha Floor and Toga Lk -->
+		<switch name="fadec/alpha-floor-engage">
+			<default value="9.5"/>
+			<test logic="OR" value="15">
+				/controls/flight/flaps-pos eq 1
+				/controls/flight/flaps-pos eq 2
+				/controls/flight/flaps-pos eq 3
+			</test>
+			<test value="14">
+				/controls/flight/flaps-pos eq 4
+			</test>
+			<test value="13">
+				/controls/flight/flaps-pos eq 5
+			</test>
+		</switch>
+		
+		<switch name="fadec/alpha-floor-disengage">
+			<default value="8"/>
+			<test logic="OR" value="13">
+				/controls/flight/flaps-pos eq 1
+				/controls/flight/flaps-pos eq 2
+				/controls/flight/flaps-pos eq 3
+			</test>
+			<test value="12">
+				/controls/flight/flaps-pos eq 4
+			</test>
+			<test value="11">
+				/controls/flight/flaps-pos eq 5
+			</test>
+		</switch>
+		
+		<switch name="fadec/alpha-floor-switch">
+			<default value="fadec/alpha-floor-switch"/>
+			<test logic="OR" value="0"> <!-- Reset -->
+				position/wow eq 1
+				/it-fbw/law ne 0
+				fadec/control-1/n1-mode eq 1
+				fadec/control-2/n1-mode eq 1
+			</test>
+			<test logic="AND" value="0"> <!-- Reset -->
+				fadec/eng-out eq 1
+				/controls/flight/flaps-pos ne 0
+			</test>
+			<test logic="AND" value="0"> <!-- Reset only in Toga Lk -->
+				fadec/alpha-floor-switch eq 1
+				/it-autoflight/output/athr eq 0
+			</test>
+			<test value="2"> <!-- Alpha Floor -->
+				aero/alpha-deg-damped gt fadec/alpha-floor-engage
+			</test>
+			<test logic="AND" value="1"> <!-- Toga Lk -->
+				fadec/alpha-floor-switch eq 2
+				aero/alpha-deg-damped lt fadec/alpha-floor-disengage
+			</test>
+		</switch>
+		
+		<switch name="fadec/alpha-floor">
+			<default value="0"/>
+			<test value="1">
+				fadec/alpha-floor-switch eq 2
+			</test>
+		</switch>
+		
+		<switch name="fadec/toga-lk">
+			<default value="0"/>
+			<test value="1">
+				fadec/alpha-floor-switch eq 1
+			</test>
+		</switch>
+		
+		<!-- Common Control Logic -->
+		<fcs_function name="fadec/both-at-idle">
+			<function>
+				<ifthen>
+					<le>
+						<difference>
+							<max>
+								<property>/engines/engine[0]/n1-actual</property>
+								<property>/engines/engine[1]/n1-actual</property>
+							</max>
+							<value>0.005</value>
+						</difference>
+						<property>fadec/limit/idle</property>
+					</le>
+					<value>1</value>
+					<value>0</value>
+				</ifthen>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/max-detent">
+			<function>
+				<max>
+					<property>fadec/control-1/detent</property>
+					<property>fadec/control-2/detent</property>
+				</max>
+			</function>
+		</fcs_function>
+		
+		<switch name="fadec/limit/eng-off-wow-switch">
+			<default value="1"/>
+			<test logic="AND" value="0">
+				/engines/engine[0]/state ne 3
+				/engines/engine[1]/state ne 3
+			</test>
+			<test value="0">
+				position/wow eq 0
+			</test>
+		</switch>
+		
+		<switch name="fadec/limit/active-mode-int">
+			<default value="0"/> <!-- TOGA -->
+			<test logic="OR" value="4"> <!-- MREV -->
+				/controls/engines/engine[0]/reverse-cmd eq 1
+				/controls/engines/engine[1]/reverse-cmd eq 1
+			</test>
+			<test value="0"> <!-- TOGA -->
+				fadec/alpha-floor-switch gt 0
+			</test>
+			<test logic="AND" value="2"> <!-- CLB -->
+				fadec/max-detent le 2
+				fadec/limit/eng-off-wow-switch eq 0
+			</test>
+			<test logic="AND" value="3"> <!-- FLX -->
+				fadec/max-detent eq 4
+				fadec/limit/flex-active eq 1
+				fadec/limit/eng-off-wow-switch eq 0
+			</test>
+			<test logic="AND" value="3"> <!-- FLX -->
+				fadec/max-detent le 4
+				fadec/limit/flex-active eq 1
+				fadec/limit/eng-off-wow-switch eq 1
+			</test>
+			<test logic="AND" value="1"> <!-- MCT -->
+				fadec/max-detent le 4
+				fadec/limit/flex-active ne 1
+				fadec/limit/eng-off-wow-switch eq 0
+			</test>
+		</switch>
+		
+		<switch name="fadec/limit/active-n1">
+			<default value="0"/>
+			<test value="fadec/limit/mrev">
+				fadec/limit/active-mode-int eq 4
+			</test>
+			<test value="fadec/limit/toga">
+				fadec/limit/active-mode-int eq 0
+			</test>
+			<test logic="OR" value="fadec/limit/mct">
+				fadec/limit/active-mode-int eq 1
+				fadec/limit/active-mode-int eq 3
+			</test>
+			<test value="fadec/limit/climb">
+				fadec/limit/active-mode-int eq 2
+			</test>
+		</switch>
+		
+		<!-- A/THR Logic -->
+		<switch name="fadec/athr/max-clamp">
+			<default value="fadec/limit/climb-norm"/>
+			<test value="fadec/limit/mct-norm">
+				fadec/eng-out eq 1
+			</test>
+			<clipto>
+				<min>fadec/limit/idle-norm</min> <!-- Never force it below the idle limit -->
+				<max>1</max>
+			</clipto>
+		</switch>
+		
+		<fcs_function name="fadec/athr/max">
+			<function>
+				<max>
+					<property>fadec/control-1/lever-norm</property>
+					<property>fadec/control-2/lever-norm</property>
+				</max>
+			</function>
+			<clipto>
+				<min>fadec/limit/idle-norm</min> <!-- Never force it below the idle limit -->
+				<max>fadec/athr/max-clamp</max>
+			</clipto>
+		</fcs_function>
+		
+		<switch name="fadec/athr/active">
+			<default value="0"/>
+			<test logic="OR" value="0">
+				fadec/alpha-floor-switch gt 0
+				fadec/control-1/n1-mode eq 1
+				fadec/control-2/n1-mode eq 1
+			</test>
+			<test logic="AND" value="1">
+				/it-autoflight/output/athr eq 1
+				fadec/eng-out eq 1
+				fadec/max-detent le 4
+				fadec/max-detent ge 1
+			</test>
+			<test logic="AND" value="1">
+				/it-autoflight/output/athr eq 1
+				fadec/max-detent eq 2
+			</test>
+			<test logic="AND" value="1">
+				/it-autoflight/output/athr eq 1
+				fadec/max-detent eq 1
+			</test>
+		</switch>
+		
+		<pure_gain name="fadec/athr/output">
+			<input>fadec/athr/cmd</input>
+			<gain>1.0</gain>
+			<clipto>
+				<min>fadec/limit/idle-norm</min>
+				<max>fadec/athr/max</max>
+			</clipto>
+		</pure_gain>
+		
+		<!-- Throttle Finals -->
+		<fcs_function name="fadec/thr-locked-n1">
+			<function>
+				<ifthen>
+					<eq>
+						<property>fadec/thr-locked</property>
+						<value>1</value>
+					</eq>
+					<property>fadec/thr-locked-n1</property>
+					<max>
+						<property>/engines/engine[0]/n1-actual</property>
+						<property>/engines/engine[1]/n1-actual</property>
+					</max>
+				</ifthen>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/thr-locked-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/thr-locked-n1</independentVar>
+					<tableData>
+						 22.4  0
+						100.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<pure_gain name="fadec/control-1/throttle-clamped">
+			<input>fadec/control-1/lever-norm</input>
+			<gain>1.0</gain>
+			<clipto>
+				<min>fadec/limit/idle-norm</min>
+				<max>1</max>
+			</clipto>
+		</pure_gain>
+		
+		<switch name="fadec/control-1/throttle-output">
+			<default value="fadec/control-1/lever-norm"/>
+			<test value="fadec/reverse-1/throttle-rev">
+				fadec/reverse-1/position-norm ne 0
+			</test>
+			<test value="fadec/limit/toga-norm">
+				fadec/alpha-floor-switch gt 0
+			</test>
+			<test value="fadec/thr-locked-norm">
+				fadec/thr-locked eq 1
+			</test>
+			<test value="fadec/athr/output">
+				fadec/athr/active eq 1
+			</test>
+			<test value="fadec/control-1/throttle-clamped"> <!-- Last -->
+				/gear/gear[0]/wow eq 0
+			</test>
+		</switch>
+		
+		<lag_filter name="fadec/control-1/throttle-fdm">
+			<input>fadec/control-1/throttle-output</input>
+			<c1>0.75</c1>
+			<output>fcs/throttle-pos-norm[0]</output>
+		</lag_filter>
+		
+		<pure_gain name="fadec/control-2/throttle-clamped">
+			<input>fadec/control-2/lever-norm</input>
+			<gain>1.0</gain>
+			<clipto>
+				<min>fadec/limit/idle-norm</min>
+				<max>1</max>
+			</clipto>
+		</pure_gain>
+		
+		<switch name="fadec/control-2/throttle-output">
+			<default value="fadec/control-2/lever-norm"/>
+			<test value="fadec/reverse-2/throttle-rev">
+				fadec/reverse-2/position-norm ne 0
+			</test>
+			<test value="fadec/limit/toga-norm">
+				fadec/alpha-floor-switch gt 0
+			</test>
+			<test value="fadec/thr-locked-norm">
+				fadec/thr-locked eq 1
+			</test>
+			<test value="fadec/athr/output">
+				fadec/athr/active eq 1
+			</test>
+			<test value="fadec/control-2/throttle-clamped"> <!-- Last -->
+				/gear/gear[0]/wow eq 0
+			</test>
+		</switch>
+		
+		<lag_filter name="fadec/control-2/throttle-fdm">
+			<input>fadec/control-2/throttle-output</input>
+			<c1>0.75</c1>
+			<output>fcs/throttle-pos-norm[1]</output>
+		</lag_filter>
+	
+	</channel>
+	
+	<channel name="Engine Parameters" execrate="2">
+		
+		<lag_filter name="fadec/n1-actual-1">
+			<input>/engines/engine[0]/n1</input>
+			<c1>2.25</c1>
+			<output>/engines/engine[0]/n1-actual</output>
+			<output>/engines/engine[3]/n1</output>
+		</lag_filter>
+		
+		<lag_filter name="fadec/n1-actual-2">
+			<input>/engines/engine[1]/n1</input>
+			<c1>2.25</c1>
+			<output>/engines/engine[1]/n1-actual</output>
+			<output>/engines/engine[4]/n1</output>
+		</lag_filter>
+		
+		<lag_filter name="fadec/n2-actual-1">
+			<input>/engines/engine[0]/n2</input>
+			<c1>2.25</c1>
+			<output>/engines/engine[0]/n2-actual</output>
+			<output>/engines/engine[3]/n2</output>
+		</lag_filter>
+		
+		<lag_filter name="fadec/n2-actual-2">
+			<input>/engines/engine[1]/n2</input>
+			<c1>2.25</c1>
+			<output>/engines/engine[1]/n2-actual</output>
+			<output>/engines/engine[4]/n2</output>
+		</lag_filter>
+		
+		<lag_filter name="fadec/ff-actual-1">
+			<input>/engines/engine[0]/fuel-flow_pph</input>
+			<c1>3</c1>
+			<output>/engines/engine[0]/ff-actual</output>
+		</lag_filter>
+		
+		<lag_filter name="fadec/ff-actual-2">
+			<input>/engines/engine[1]/fuel-flow_pph</input>
+			<c1>3</c1>
+			<output>/engines/engine[1]/ff-actual</output>
+		</lag_filter>
+	
+	</channel>
+	
+	<channel name="Upper ECAM Needles" execrate="4">
+		
+		<fcs_function name="/instrumentation/upper-ecam/epr[0]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/epr-actual</independentVar>
+					<tableData>
+						0.97 -139
+						1.00 -125
+						1.20  -55
+						1.40   16
+						1.60   87
+						1.65   98
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/epr[1]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/epr-actual</independentVar>
+					<tableData>
+						0.97 -139
+						1.00 -125
+						1.20  -55
+						1.40   16
+						1.60   87
+						1.65   98
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/epr-thr[0]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/epr-actual</independentVar> <!-- Fix prop -->
+					<tableData>
+						0.97 -139
+						1.00 -125
+						1.20  -55
+						1.40   16
+						1.60   87
+						1.65   98
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/epr-thr[1]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[1]/epr-actual</independentVar> <!-- Fix prop -->
+					<tableData>
+						0.97 -139
+						1.00 -125
+						1.20  -55
+						1.40   16
+						1.60   87
+						1.65   98
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/epr-limit">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/epr-actual</independentVar> <!-- Fix prop -->
+					<tableData>
+						0.97 -139
+						1.00 -125
+						1.20  -55
+						1.40   16
+						1.60   87
+						1.65   98
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/n1[0]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/n1-actual</independentVar>
+					<tableData>
+						 20 -112.5
+						 40  -67.5
+						100   67.5
+						110   90.0
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/n1[1]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[1]/n1-actual</independentVar>
+					<tableData>
+						 20 -112.5
+						 40  -67.5
+						100   67.5
+						110   90.0
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/n1-thr[0]">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/control-1/lever-n1</independentVar>
+					<tableData>
+						 20 -112.5
+						 40  -67.5
+						100   67.5
+						110   90.0
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/n1-thr[1]">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/control-2/lever-n1</independentVar>
+					<tableData>
+						 20 -112.5
+						 40  -67.5
+						100   67.5
+						110   90.0
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/n1-limit">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/toga</independentVar>
+					<tableData>
+						 20 -112.5
+						 40  -67.5
+						100   67.5
+						110   90.0
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/egt[0]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/egt-actual</independentVar>
+					<tableData>
+						  0 -90
+						400   0
+						800  90
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/egt[1]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[1]/egt-actual</independentVar>
+					<tableData>
+						  0 -90
+						400   0
+						800  90
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+	
+	</channel>
+
+</system>
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index a8c38000..bf6bac48 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -4,189 +4,6 @@
 
 <PropertyList>
 	
-	<filter>
-		<name>EPR 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/epr-actual</property>
-					<entry><ind>0.970</ind><dep>-139</dep></entry>
-					<entry><ind>1.000</ind><dep>-125</dep></entry>
-					<entry><ind>1.200</ind><dep> -55</dep></entry>
-					<entry><ind>1.400</ind><dep>  16</dep></entry>
-					<entry><ind>1.600</ind><dep>  87</dep></entry>
-					<entry><ind>1.650</ind><dep>  98</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/ECAM/Upper/EPR[0]</output>
-	</filter>
-	
-	<filter>
-		<name>EPR THR 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/epr-cmd</property>
-					<entry><ind>0.970</ind><dep>-139</dep></entry>
-					<entry><ind>1.000</ind><dep>-125</dep></entry>
-					<entry><ind>1.200</ind><dep> -55</dep></entry>
-					<entry><ind>1.400</ind><dep>  16</dep></entry>
-					<entry><ind>1.600</ind><dep>  87</dep></entry>
-					<entry><ind>1.650</ind><dep>  98</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/ECAM/Upper/EPRthr[0]</output>
-	</filter>
-	
-	<filter>
-		<name>EPR 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/epr-actual</property>
-					<entry><ind>0.970</ind><dep>-139</dep></entry>
-					<entry><ind>1.000</ind><dep>-125</dep></entry>
-					<entry><ind>1.200</ind><dep> -55</dep></entry>
-					<entry><ind>1.400</ind><dep>  16</dep></entry>
-					<entry><ind>1.600</ind><dep>  87</dep></entry>
-					<entry><ind>1.650</ind><dep>  98</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/ECAM/Upper/EPR[1]</output>
-	</filter>
-	
-	<filter>
-		<name>EPR THR 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/epr-cmd</property>
-					<entry><ind>0.970</ind><dep>-139</dep></entry>
-					<entry><ind>1.000</ind><dep>-125</dep></entry>
-					<entry><ind>1.200</ind><dep> -55</dep></entry>
-					<entry><ind>1.400</ind><dep>  16</dep></entry>
-					<entry><ind>1.600</ind><dep>  87</dep></entry>
-					<entry><ind>1.650</ind><dep>  98</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/ECAM/Upper/EPRthr[1]</output>
-	</filter>
-	
-	<filter>
-		<name>EPR LIMIT</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/fadec/epr/toga-lim</property>
-					<entry><ind>0.970</ind><dep>-139</dep></entry>
-					<entry><ind>1.000</ind><dep>-125</dep></entry>
-					<entry><ind>1.200</ind><dep> -55</dep></entry>
-					<entry><ind>1.400</ind><dep>  16</dep></entry>
-					<entry><ind>1.600</ind><dep>  87</dep></entry>
-					<entry><ind>1.650</ind><dep>  98</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/ECAM/Upper/EPRylim</output>
-	</filter>
-	
-	<!--filter>
-		<name>N1 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/n1-actual</property>
-					<entry><ind> 20.0</ind><dep>-112.5</dep></entry>
-					<entry><ind> 40.0</ind><dep> -67.5</dep></entry>
-					<entry><ind>100.0</ind><dep>  67.5</dep></entry>
-					<entry><ind>110.0</ind><dep>  90.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/instrumentation/upper-ecam/n1[0]</output>
-	</filter>
-	
-	<filter>
-		<name>N1 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/n1-actual</property>
-					<entry><ind> 20.0</ind><dep>-112.5</dep></entry>
-					<entry><ind> 40.0</ind><dep> -67.5</dep></entry>
-					<entry><ind>100.0</ind><dep>  67.5</dep></entry>
-					<entry><ind>110.0</ind><dep>  90.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/instrumentation/upper-ecam/n1[1]</output>
-	</filter-->
-	
 	<filter>
 		<name>Flap Indicator</name>
 		<type>gain</type>