From 449704e36cd33ff4644da06db882d0fb90f8b31c Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 20 Oct 2017 18:37:10 -0400
Subject: [PATCH] A32X: Brand new EPR calculation, better FADECs

---
 Nasal/fadec-common.nas       |   16 +-
 Sounds/A320-common-sound.xml |    5 +-
 Systems/fadec-cfm.xml        |  460 ++++++--------
 Systems/fadec-iae.xml        | 1107 ++++++++++++++++++----------------
 4 files changed, 800 insertions(+), 788 deletions(-)

diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas
index d597376a..a6298305 100644
--- a/Nasal/fadec-common.nas
+++ b/Nasal/fadec-common.nas
@@ -70,9 +70,9 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
 				setprop("/it-autoflight/input/athr", 1);
 			}
 			if (getprop("/controls/engines/thrust-limit") == "FLX") {
-				setprop("/controls/engines/engine[0]/throttle-fdm", 0.97);
+				setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
 			} else {
-				setprop("/controls/engines/engine[0]/throttle-fdm", 0.94);
+				setprop("/controls/engines/engine[0]/throttle-fdm", 0.95);
 			}
 			setprop("/systems/thrust/state1", "MCT");
 		} else if (thr1 >= 0.83 and thr1 < 0.95) {
@@ -85,7 +85,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
 			if (getprop("/gear/gear[1]/wow") == 1 or getprop("/gear/gear[2]/wow") == 1) {
 				setprop("/it-autoflight/input/athr", 1);
 			}
-			setprop("/controls/engines/engine[0]/throttle-fdm", 0.97);
+			setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
 			setprop("/systems/thrust/state1", "TOGA");
 			unflex();
 		}
@@ -105,7 +105,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
 		} else if (thr1 >= 0.95) {
 			setprop("/systems/thrust/state1", "TOGA");
 		}
-		setprop("/controls/engines/engine[0]/throttle-fdm", 0.97);
+		setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
 	}
 });
 
@@ -130,9 +130,9 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
 				setprop("/it-autoflight/input/athr", 1);
 			}
 			if (getprop("/controls/engines/thrust-limit") == "FLX") {
-				setprop("/controls/engines/engine[1]/throttle-fdm", 0.97);
+				setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);
 			} else {
-				setprop("/controls/engines/engine[1]/throttle-fdm", 0.94);
+				setprop("/controls/engines/engine[1]/throttle-fdm", 0.95);
 			}
 			setprop("/systems/thrust/state2", "MCT");
 		} else if (thr2 >= 0.83 and thr2 < 0.95) {
@@ -145,7 +145,7 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
 			if (getprop("/gear/gear[1]/wow") == 1 or getprop("/gear/gear[2]/wow") == 1) {
 				setprop("/it-autoflight/input/athr", 1);
 			}
-			setprop("/controls/engines/engine[1]/throttle-fdm", 0.97);
+			setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);
 			setprop("/systems/thrust/state2", "TOGA");
 			unflex();
 		}
@@ -165,7 +165,7 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
 		} else if (thr2 >= 0.95) {
 			setprop("/systems/thrust/state2", "TOGA");
 		}
-		setprop("/controls/engines/engine[1]/throttle-fdm", 0.97);
+		setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);
 	}
 });
 
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index 2fef02fa..b9d2adfe 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -44,7 +44,8 @@
 			</pitch>
 		</apu>
 	
-		<hyd>
+		<!-- Disabled until proper PTU system implemented, to not annoy people -->
+		<!--hyd>
 			<name>PTU</name>
 			<mode>once</mode>
 			<path>airbus_ptu.wav</path>
@@ -56,7 +57,7 @@
 			</volume>
 			<reference-dist>20.0</reference-dist>
 			<max-dist>100.0</max-dist>
-		</hyd>
+		</hyd-->
 		
 		<announcement>
 			<name>PurserSnacks</name>
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index 70cb04aa..c6e32de6 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -11,57 +11,57 @@
 
 <PropertyList>
 
-    <filter>
-        <name>MAN One</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
+	<filter>
+		<name>MAN One</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
 				<table>
 					<property>/controls/engines/engine[0]/throttle-pos</property>
 					<entry><ind>0.00</ind><dep>0.00</dep></entry>
 					<entry><ind>0.01</ind><dep>0.00</dep></entry>
 					<entry><ind>0.60</ind><dep>0.91</dep></entry>
 					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.94</dep></entry>
-					<entry><ind>0.83</ind><dep>0.94</dep></entry>
-					<entry><ind>0.95</ind><dep>0.97</dep></entry>
+					<entry><ind>0.78</ind><dep>0.95</dep></entry>
+					<entry><ind>0.83</ind><dep>0.95</dep></entry>
+					<entry><ind>0.95</ind><dep>0.99</dep></entry>
 				</table>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[0]/throttle-man</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>MAN Two</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
+	<filter>
+		<name>MAN Two</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
 				<table>
 					<property>/controls/engines/engine[1]/throttle-pos</property>
 					<entry><ind>0.00</ind><dep>0.00</dep></entry>
 					<entry><ind>0.01</ind><dep>0.00</dep></entry>
 					<entry><ind>0.60</ind><dep>0.91</dep></entry>
 					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.94</dep></entry>
-					<entry><ind>0.83</ind><dep>0.94</dep></entry>
-					<entry><ind>0.95</ind><dep>0.97</dep></entry>
+					<entry><ind>0.78</ind><dep>0.95</dep></entry>
+					<entry><ind>0.83</ind><dep>0.95</dep></entry>
+					<entry><ind>0.95</ind><dep>0.99</dep></entry>
 				</table>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[1]/throttle-man</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>MAN CMD One</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
+   <filter>
+		<name>MAN CMD One</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
 				<product>
 					<table>
 						<property>/controls/engines/engine[0]/throttle-pos</property>
@@ -69,24 +69,24 @@
 						<entry><ind>0.01</ind><dep>0.00</dep></entry>
 						<entry><ind>0.60</ind><dep>0.91</dep></entry>
 						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.94</dep></entry>
-						<entry><ind>0.83</ind><dep>0.94</dep></entry>
-						<entry><ind>0.95</ind><dep>0.97</dep></entry>
+						<entry><ind>0.78</ind><dep>0.95</dep></entry>
+						<entry><ind>0.83</ind><dep>0.95</dep></entry>
+						<entry><ind>0.95</ind><dep>0.99</dep></entry>
 					</table>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[0]/throttle-cmd-man</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>MAN CMD Two</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
+	<filter>
+		<name>MAN CMD Two</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
 				<product>
 					<table>
 						<property>/controls/engines/engine[1]/throttle-pos</property>
@@ -94,23 +94,23 @@
 						<entry><ind>0.01</ind><dep>0.00</dep></entry>
 						<entry><ind>0.60</ind><dep>0.91</dep></entry>
 						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.94</dep></entry>
-						<entry><ind>0.83</ind><dep>0.94</dep></entry>
-						<entry><ind>0.95</ind><dep>0.97</dep></entry>
+						<entry><ind>0.78</ind><dep>0.95</dep></entry>
+						<entry><ind>0.83</ind><dep>0.95</dep></entry>
+						<entry><ind>0.95</ind><dep>0.99</dep></entry>
 					</table>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[1]/throttle-cmd-man</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>N1 CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
+	<filter>
+		<name>N1 CMD 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -123,35 +123,35 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
-                <table>
+			<expression>
+				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/engines/flx-throttle</property>
 					</product>
-                    <entry><ind>0.00</ind><dep> 19.7</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[0]/throttle-cmd-man</property>
-                    <entry><ind>0.00</ind><dep> 19.7</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
+					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<expression>
+				<table>
+					<property>/controls/engines/engine[0]/throttle-cmd-man</property>
+					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[0]/n1-actual-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>N1 CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
+	<filter>
+		<name>N1 CMD 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -164,94 +164,28 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
-                <table>
+			<expression>
+				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/engines/flx-throttle</property>
 					</product>
-                    <entry><ind>0.00</ind><dep> 19.7</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[1]/throttle-cmd-man</property>
-                    <entry><ind>0.00</ind><dep> 19.7</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
+					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<expression>
+				<table>
+					<property>/controls/engines/engine[1]/throttle-cmd-man</property>
+					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[1]/n1-actual-cmd</output>
-    </filter>
-	
-    <filter>
-        <name>N1 A/THR CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[0]/throttle-cmd-cmd</property>
-                    <entry><ind>0.00</ind><dep> 19.7</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
-		<output>/engines/engine[0]/n1-actual-athr-cmd</output>
-    </filter>
-	
-    <filter>
-        <name>N1 A/THR CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[1]/throttle-cmd-cmd</property>
-                    <entry><ind>0.00</ind><dep> 19.7</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
-		<output>/engines/engine[1]/n1-actual-athr-cmd</output>
-    </filter>
-	
-    <filter>
-        <name>N1 A/THR DIFFERENCE 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-				<dif>
-					<property>/engines/engine[0]/n1-actual</property>
-					<property>/engines/engine[0]/n1-actual-athr-cmd</property>
-				</dif>
-            </expression>
-        </input>
-		<output>/engines/engine[0]/n1-actual-diff</output>
-    </filter>
-	
-    <filter>
-        <name>N1 A/THR DIFFERENCE 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-				<dif>
-					<property>/engines/engine[1]/n1-actual</property>
-					<property>/engines/engine[1]/n1-actual-athr-cmd</property>
-				</dif>
-            </expression>
-        </input>
-		<output>/engines/engine[1]/n1-actual-diff</output>
-    </filter>
+	</filter>
 	
 	<filter>
 		<name>Throttle 1</name>
@@ -441,73 +375,73 @@
 		</output>
 	</filter>
 	
-    <filter>
-        <name>N1 Limit TOGA</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>N1 Limit TOGA</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/controls/engines/throttle-scale</property>
 					</product>
 					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
 					<entry><ind>1.00</ind><dep>103.8</dep></entry>
 				</table>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/n1/toga-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>N1 Limit MCT</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>N1 Limit MCT</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<table>
 					<product>
-						<value>0.94</value>
+						<value>0.95</value>
 						<property>/controls/engines/throttle-scale</property>
 					</product>
 					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
 					<entry><ind>1.00</ind><dep>103.8</dep></entry>
 				</table>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/n1/mct-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>N1 Limit FLX</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>N1 Limit FLX</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/engines/flx-throttle</property>
 					</product>
 					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
 					<entry><ind>1.00</ind><dep>103.8</dep></entry>
 				</table>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/n1/flx-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>N1 Limit CLB</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>N1 Limit CLB</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<table>
 					<product>
 						<value>0.91</value>
@@ -516,16 +450,16 @@
 					<entry><ind>0.00</ind><dep> 19.7</dep></entry>
 					<entry><ind>1.00</ind><dep>103.8</dep></entry>
 				</table>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/n1/clb-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>Throttle Output One</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
+	<filter>
+		<name>Throttle Output One</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -538,29 +472,29 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[0]/throttle-fdm</property>
 					<property>/engines/flx-throttle</property>
 				</product>
-            </expression>
-        </input>
-        <input>
-            <expression>
+			</expression>
+		</input>
+		<input>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[0]/throttle-fdm</property>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[0]/throttle-output</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>Throttle Output Two</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
+	<filter>
+		<name>Throttle Output Two</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -573,28 +507,28 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[1]/throttle-fdm</property>
 					<property>/engines/flx-throttle</property>
 				</product>
-            </expression>
-        </input>
-        <input>
-            <expression>
+			</expression>
+		</input>
+		<input>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[1]/throttle-fdm</property>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[1]/throttle-output</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EGT L</name>
-        <type>gain</type>
-        <gain>1</gain>
+	<filter>
+		<name>EGT L</name>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -609,22 +543,22 @@
 				</and>
 			</condition>
 		</enable>
-        <input>
-            <expression>
-                <table>
-                    <property>/engines/engine[0]/n1-actual</property> 
-                    <entry><ind> 19.7</ind><dep>434</dep></entry>
-                    <entry><ind>110.0</ind><dep>620</dep></entry>
-                </table>
-            </expression>
-        </input>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[0]/n1-actual</property> 
+					<entry><ind> 19.7</ind><dep>434</dep></entry>
+					<entry><ind>110.0</ind><dep>620</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[0]/egt-actual</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EGT R</name>
-        <type>gain</type>
-        <gain>1</gain>
+	<filter>
+		<name>EGT R</name>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -639,16 +573,16 @@
 				</and>
 			</condition>
 		</enable>
-        <input>
-            <expression>
-                <table>
-                    <property>/engines/engine[1]/n1-actual</property> 
-                    <entry><ind> 19.7</ind><dep>434</dep></entry>
-                    <entry><ind>110.0</ind><dep>620</dep></entry>
-                </table>
-            </expression>
-        </input>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[1]/n1-actual</property> 
+					<entry><ind> 19.7</ind><dep>434</dep></entry>
+					<entry><ind>110.0</ind><dep>620</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[1]/egt-actual</output>
-    </filter>
+	</filter>
 
 </PropertyList>
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 1bdbafbb..96885bb0 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -11,57 +11,57 @@
 
 <PropertyList>
 
-    <filter>
-        <name>MAN One</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[0]/throttle-pos</property>
+	<filter>
+		<name>MAN One</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
+				<table>
+					<property>/controls/engines/engine[0]/throttle-pos</property>
 					<entry><ind>0.00</ind><dep>0.00</dep></entry>
 					<entry><ind>0.01</ind><dep>0.00</dep></entry>
 					<entry><ind>0.60</ind><dep>0.91</dep></entry>
 					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.94</dep></entry>
-					<entry><ind>0.83</ind><dep>0.94</dep></entry>
-					<entry><ind>0.95</ind><dep>0.97</dep></entry>
-                </table>
-            </expression>
-        </input>
+					<entry><ind>0.78</ind><dep>0.95</dep></entry>
+					<entry><ind>0.83</ind><dep>0.95</dep></entry>
+					<entry><ind>0.95</ind><dep>0.99</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[0]/throttle-man</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>MAN Two</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[1]/throttle-pos</property>
+	<filter>
+		<name>MAN Two</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
+				<table>
+					<property>/controls/engines/engine[1]/throttle-pos</property>
 					<entry><ind>0.00</ind><dep>0.00</dep></entry>
 					<entry><ind>0.01</ind><dep>0.00</dep></entry>
 					<entry><ind>0.60</ind><dep>0.91</dep></entry>
 					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.94</dep></entry>
-					<entry><ind>0.83</ind><dep>0.94</dep></entry>
-					<entry><ind>0.95</ind><dep>0.97</dep></entry>
-                </table>
-            </expression>
-        </input>
+					<entry><ind>0.78</ind><dep>0.95</dep></entry>
+					<entry><ind>0.83</ind><dep>0.95</dep></entry>
+					<entry><ind>0.95</ind><dep>0.99</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[1]/throttle-man</output>
-    </filter>
+	</filter>
 	
    <filter>
-        <name>MAN CMD One</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
+		<name>MAN CMD One</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
 				<product>
 					<table>
 						<property>/controls/engines/engine[0]/throttle-pos</property>
@@ -69,24 +69,24 @@
 						<entry><ind>0.01</ind><dep>0.00</dep></entry>
 						<entry><ind>0.60</ind><dep>0.91</dep></entry>
 						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.94</dep></entry>
-						<entry><ind>0.83</ind><dep>0.94</dep></entry>
-						<entry><ind>0.95</ind><dep>0.97</dep></entry>
+						<entry><ind>0.78</ind><dep>0.95</dep></entry>
+						<entry><ind>0.83</ind><dep>0.95</dep></entry>
+						<entry><ind>0.95</ind><dep>0.99</dep></entry>
 					</table>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[0]/throttle-cmd-man</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>MAN CMD Two</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input> 
-            <expression>
+	<filter>
+		<name>MAN CMD Two</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
 				<product>
 					<table>
 						<property>/controls/engines/engine[1]/throttle-pos</property>
@@ -94,88 +94,217 @@
 						<entry><ind>0.01</ind><dep>0.00</dep></entry>
 						<entry><ind>0.60</ind><dep>0.91</dep></entry>
 						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.94</dep></entry>
-						<entry><ind>0.83</ind><dep>0.94</dep></entry>
-						<entry><ind>0.95</ind><dep>0.97</dep></entry>
+						<entry><ind>0.78</ind><dep>0.95</dep></entry>
+						<entry><ind>0.83</ind><dep>0.95</dep></entry>
+						<entry><ind>0.95</ind><dep>0.99</dep></entry>
 					</table>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[1]/throttle-cmd-man</output>
-    </filter>
+	</filter>
 
-    <filter>
-        <name>EPR Scale</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input> 
-            <expression>
-                <table>
-                    <property>/position/altitude-ft</property> 
-                    <entry><ind>    0</ind><dep>0.437</dep></entry>
-                    <entry><ind>42000</ind><dep>0.931</dep></entry>
-                </table>
-            </expression>
-        </input>
+	<filter>
+		<name>EPR Scale</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<table>
+					<property>/position/altitude-ft</property> 
+					<entry><ind>    0</ind><dep>0.467</dep></entry>
+					<entry><ind>42000</ind><dep>1.076</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/epr-scale</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR Scale 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input> 
-            <expression>
-                <table>
-                    <property>/position/altitude-ft</property> 
-                    <entry><ind>    0</ind><dep>0.990</dep></entry>
-                    <entry><ind>42000</ind><dep>0.806</dep></entry>
-                </table>
-            </expression>
-        </input>
+	<filter>
+		<name>EPR Scale 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<table>
+					<property>/position/altitude-ft</property> 
+					<entry><ind>    0</ind><dep>0.989</dep></entry>
+					<entry><ind>42000</ind><dep>0.708</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/epr-scale-b</output>
-    </filter>
-
-    <filter>
-        <name>EPR 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
-            <expression>
-                <table>
-                    <property>/engines/engine[0]/n1-actual</property>
-                    <entry><ind> 18.0</ind><dep>0.00</dep></entry>
-                    <entry><ind> 22.4</ind><dep>0.03</dep></entry>
-                    <entry><ind>103.8</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
-			<scale>/engines/epr-scale</scale>
-        </input>
-		<output>/engines/engine[0]/epr-actual-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
-            <expression>
+	<!-- -->
+	
+	<filter>
+		<name>EPR N1 Input Engine 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<product>
+					<property>/engines/engine[0]/n1-actual</property> 
+					<table>
+						<property>/engines/engine[0]/n1-actual</property> 
+						<entry><ind> 22.4</ind><dep> 1</dep></entry>
+						<entry><ind>103.8</ind><dep>50</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<output>/engines/engine[0]/epr-n1-input</output>
+	</filter>
+	
+	<filter>
+		<name>EPR N1 Input Engine 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<product>
+					<property>/engines/engine[1]/n1-actual</property> 
+					<table>
+						<property>/engines/engine[1]/n1-actual</property> 
+						<entry><ind> 22.4</ind><dep> 1</dep></entry>
+						<entry><ind>103.8</ind><dep>50</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<output>/engines/engine[1]/epr-n1-input</output>
+	</filter>
+	
+	<filter>
+		<name>EPR THR Input Engine 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<product>
+					<table>
+						<property>/controls/engines/engine[0]/throttle-cmd-man</property> 
+						<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+						<entry><ind>1.0</ind><dep>103.8</dep></entry>
+					</table>
+					<table>
+						<table>
+							<property>/controls/engines/engine[0]/throttle-cmd-man</property> 
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<entry><ind> 22.4</ind><dep> 1</dep></entry>
+						<entry><ind>103.8</ind><dep>50</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<output>/engines/engine[0]/epr-thr-input</output>
+	</filter>
+	
+	<filter>
+		<name>EPR THR Input Engine 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<product>
+					<table>
+						<property>/controls/engines/engine[1]/throttle-cmd-man</property> 
+						<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+						<entry><ind>1.0</ind><dep>103.8</dep></entry>
+					</table>
+					<table>
+						<table>
+							<property>/controls/engines/engine[1]/throttle-cmd-man</property> 
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<entry><ind> 22.4</ind><dep> 1</dep></entry>
+						<entry><ind>103.8</ind><dep>50</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<output>/engines/engine[1]/epr-thr-input</output>
+	</filter>
+	
+	<filter>
+		<name>EPR THR Input Flex</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input> 
+			<expression>
+				<product>
+					<table>
+						<product>
+							<value>0.99</value>
+							<property>/engines/flx-throttle</property>
+						</product>
+						<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+						<entry><ind>1.0</ind><dep>103.8</dep></entry>
+					</table>
+					<table>
+						<table>
+							<product>
+								<value>0.99</value>
+								<property>/engines/flx-throttle</property>
+							</product>
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<entry><ind> 22.4</ind><dep> 1</dep></entry>
+						<entry><ind>103.8</ind><dep>50</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<output>/engines/epr-flex-input</output>
+	</filter>
+	
+	<!-- -->
+
+	<filter>
+		<name>EPR 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[0]/epr-n1-input</property>
+					<entry><ind>  18.0</ind><dep>0.00</dep></entry>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
+			<scale>/engines/epr-scale</scale>
+		</input>
+		<output>/engines/engine[0]/epr-actual-cmd</output>
+	</filter>
+	
+	<filter>
+		<name>EPR 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<expression>
 				<sum>
 					<property>/engines/engine[0]/epr-actual-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/engines/engine[0]/epr-actual</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
+	<filter>
+		<name>EPR CMD 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -188,86 +317,83 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
-                <table>
-					<product>
-						<value>0.97</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+			<expression>
+				<table>
+					<property>/engines/epr-flex-input</property>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[0]/throttle-cmd-man</property>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+		</input>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[0]/epr-thr-input</property>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/engines/engine[0]/epr-cmd-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR CMD 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<sum>
 					<property>/engines/engine[0]/epr-cmd-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/engines/engine[0]/epr-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
-            <expression>
-                <table>
-                    <property>/engines/engine[1]/n1-actual</property> 
-                    <entry><ind> 18.0</ind><dep>0.00</dep></entry>
-                    <entry><ind> 22.4</ind><dep>0.03</dep></entry>
-                    <entry><ind>103.8</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+	<filter>
+		<name>EPR 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[1]/epr-n1-input</property>
+					<entry><ind>  18.0</ind><dep>0.00</dep></entry>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/engines/engine[1]/epr-actual-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<expression>
 				<sum>
 					<property>/engines/engine[1]/epr-actual-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/engines/engine[1]/epr-actual</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
+	<filter>
+		<name>EPR CMD 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -280,153 +406,50 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
-                <table>
-					<product>
-						<value>0.97</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+			<expression>
+				<table>
+					<property>/engines/epr-flex-input</property>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[1]/throttle-cmd-man</property>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+		</input>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[0]/epr-thr-input</property>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/engines/engine[1]/epr-cmd-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR CMD 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<sum>
 					<property>/engines/engine[1]/epr-cmd-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/engines/engine[1]/epr-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR A/THR CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[0]/throttle-cmd-cmd</property>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
-			<scale>/engines/epr-scale</scale>
-        </input>
-		<output>/engines/engine[0]/epr-athr-cmd</output>
-    </filter>
-	
-    <filter>
-        <name>EPR A/THR CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-				<sum>
-					<property>/engines/engine[0]/epr-athr-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-            </expression>
-        </input>
-		<output>/engines/engine[0]/epr-athr</output>
-    </filter>
-	
-    <filter>
-        <name>EPR A/THR CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[1]/throttle-cmd-cmd</property>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
-			<scale>/engines/epr-scale</scale>
-        </input>
-		<output>/engines/engine[1]/epr-athr-cmd</output>
-    </filter>
-	
-    <filter>
-        <name>EPR A/THR CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-				<sum>
-					<property>/engines/engine[1]/epr-athr-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-            </expression>
-        </input>
-		<output>/engines/engine[1]/epr-athr</output>
-    </filter>
-	
-    <filter>
-        <name>EPR A/THR DIFFERENCE 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-				<dif>
-					<property>/engines/engine[0]/epr-actual</property>
-					<property>/engines/engine[0]/epr-athr</property>
-				</dif>
-            </expression>
-        </input>
-		<output>/engines/engine[0]/epr-diff</output>
-    </filter>
-	
-    <filter>
-        <name>EPR A/THR DIFFERENCE 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-				<dif>
-					<property>/engines/engine[1]/epr-actual</property>
-					<property>/engines/engine[1]/epr-athr</property>
-				</dif>
-            </expression>
-        </input>
-		<output>/engines/engine[1]/epr-diff</output>
-    </filter>
-	
-    <filter>
-        <name>N1 CMD 1</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
+	<filter>
+		<name>N1 CMD 1</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -439,35 +462,35 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
-                <table>
+			<expression>
+				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/engines/flx-throttle</property>
 					</product>
-                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[0]/throttle-cmd-man</property>
-                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
+					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<expression>
+				<table>
+					<property>/controls/engines/engine[0]/throttle-cmd-man</property>
+					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[0]/n1-actual-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>N1 CMD 2</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
+	<filter>
+		<name>N1 CMD 2</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -480,28 +503,28 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
-                <table>
+			<expression>
+				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/engines/flx-throttle</property>
 					</product>
-                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
-        <input>
-            <expression>
-                <table>
-                    <property>/controls/engines/engine[1]/throttle-cmd-man</property>
-                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
-                    <entry><ind>1.00</ind><dep>103.8</dep></entry>
-                </table>
-            </expression>
-        </input>
+					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<expression>
+				<table>
+					<property>/controls/engines/engine[1]/throttle-cmd-man</property>
+					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
+					<entry><ind>1.00</ind><dep>103.8</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[1]/n1-actual-cmd</output>
-    </filter>
+	</filter>
 	
 	<filter>
 		<name>Throttle 1</name>
@@ -691,159 +714,213 @@
 		</output>
 	</filter>
 	
-    <filter>
-        <name>EPR Limit TOGA</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
+	<filter>
+		<name>EPR Limit TOGA</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
+				<table>
 					<product>
-						<value>0.97</value>
-						<property>/controls/engines/throttle-scale</property>
+						<table>
+							<product>
+								<value>0.99</value>
+								<property>/controls/engines/throttle-scale</property>
+							</product>
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<table>
+							<table>
+								<product>
+									<value>0.99</value>
+									<property>/controls/engines/throttle-scale</property>
+								</product>
+								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+								<entry><ind>1.0</ind><dep>103.8</dep></entry>
+							</table>
+							<entry><ind> 22.4</ind><dep> 1</dep></entry>
+							<entry><ind>103.8</ind><dep>50</dep></entry>
+						</table>
 					</product>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/systems/thrust/epr/toga-lim-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD TOGA</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR CMD TOGA</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<sum>
 					<property>/systems/thrust/epr/toga-lim-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/epr/toga-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR Limit MCT</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
+	<filter>
+		<name>EPR Limit MCT</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
+				<table>
 					<product>
-						<value>0.94</value>
-						<property>/controls/engines/throttle-scale</property>
+						<table>
+							<product>
+								<value>0.95</value>
+								<property>/controls/engines/throttle-scale</property>
+							</product>
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<table>
+							<table>
+								<product>
+									<value>0.95</value>
+									<property>/controls/engines/throttle-scale</property>
+								</product>
+								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+								<entry><ind>1.0</ind><dep>103.8</dep></entry>
+							</table>
+							<entry><ind> 22.4</ind><dep> 1</dep></entry>
+							<entry><ind>103.8</ind><dep>50</dep></entry>
+						</table>
 					</product>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/systems/thrust/epr/mct-lim-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD MCT</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR CMD MCT</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<sum>
 					<property>/systems/thrust/epr/mct-lim-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/epr/mct-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR Limit FLX</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
+	<filter>
+		<name>EPR Limit FLX</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
+				<table>
 					<product>
-						<value>0.97</value>
+						<value>0.99</value>
 						<property>/engines/flx-throttle</property>
 					</product>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+					<entry><ind>0.000</ind><dep>0.03</dep></entry>
+					<entry><ind>1.000</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/systems/thrust/epr/flx-lim-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD FLX</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR CMD FLX</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<sum>
 					<property>/systems/thrust/epr/flx-lim-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/epr/flx-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR Limit CLB</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
-                <table>
+	<filter>
+		<name>EPR Limit CLB</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
+				<table>
 					<product>
-						<value>0.91</value>
-						<property>/controls/engines/throttle-scale</property>
+						<table>
+							<product>
+								<value>0.91</value>
+								<property>/controls/engines/throttle-scale</property>
+							</product>
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<table>
+							<table>
+								<product>
+									<value>0.91</value>
+									<property>/controls/engines/throttle-scale</property>
+								</product>
+								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+								<entry><ind>1.0</ind><dep>103.8</dep></entry>
+							</table>
+							<entry><ind> 22.4</ind><dep> 1</dep></entry>
+							<entry><ind>103.8</ind><dep>50</dep></entry>
+						</table>
 					</product>
-                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
-                </table>
-            </expression>
+					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+				</table>
+			</expression>
 			<scale>/engines/epr-scale</scale>
-        </input>
+		</input>
 		<output>/systems/thrust/epr/clb-lim-cmd</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EPR CMD CLB</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
-        <input>
-            <expression>
+	<filter>
+		<name>EPR CMD CLB</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>
+			<expression>
 				<sum>
 					<property>/systems/thrust/epr/clb-lim-cmd</property>
 					<property>/engines/epr-scale-b</property>
 				</sum>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/systems/thrust/epr/clb-lim</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>Throttle Output One</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
+	<filter>
+		<name>Throttle Output One</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -856,29 +933,29 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[0]/throttle-fdm</property>
 					<property>/engines/flx-throttle</property>
 				</product>
-            </expression>
-        </input>
-        <input>
-            <expression>
+			</expression>
+		</input>
+		<input>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[0]/throttle-fdm</property>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[0]/throttle-output</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>Throttle Output Two</name>
-        <type>gain</type>
-        <gain>1</gain>
-        <input>
+	<filter>
+		<name>Throttle Output Two</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
 			<condition>
 				<and>
 					<equals>
@@ -891,28 +968,28 @@
 					</equals>
 				</and>
 			</condition>
-            <expression>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[1]/throttle-fdm</property>
 					<property>/engines/flx-throttle</property>
 				</product>
-            </expression>
-        </input>
-        <input>
-            <expression>
+			</expression>
+		</input>
+		<input>
+			<expression>
 				<product>
 					<property>/controls/engines/engine[1]/throttle-fdm</property>
 					<property>/controls/engines/throttle-scale</property>
 				</product>
-            </expression>
-        </input>
+			</expression>
+		</input>
 		<output>/controls/engines/engine[1]/throttle-output</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EGT L</name>
-        <type>gain</type>
-        <gain>1</gain>
+	<filter>
+		<name>EGT L</name>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -927,22 +1004,22 @@
 				</and>
 			</condition>
 		</enable>
-        <input>
-            <expression>
-                <table>
-                    <property>/engines/engine[0]/n1-actual</property> 
-                    <entry><ind> 22.4</ind><dep>434</dep></entry>
-                    <entry><ind>110.0</ind><dep>620</dep></entry>
-                </table>
-            </expression>
-        </input>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[0]/n1-actual</property> 
+					<entry><ind> 22.4</ind><dep>434</dep></entry>
+					<entry><ind>110.0</ind><dep>620</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[0]/egt-actual</output>
-    </filter>
+	</filter>
 	
-    <filter>
-        <name>EGT R</name>
-        <type>gain</type>
-        <gain>1</gain>
+	<filter>
+		<name>EGT R</name>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -957,16 +1034,16 @@
 				</and>
 			</condition>
 		</enable>
-        <input>
-            <expression>
-                <table>
-                    <property>/engines/engine[1]/n1-actual</property> 
-                    <entry><ind> 22.4</ind><dep>434</dep></entry>
-                    <entry><ind>110.0</ind><dep>620</dep></entry>
-                </table>
-            </expression>
-        </input>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[1]/n1-actual</property> 
+					<entry><ind> 22.4</ind><dep>434</dep></entry>
+					<entry><ind>110.0</ind><dep>620</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/engines/engine[1]/egt-actual</output>
-    </filter>
+	</filter>
 
 </PropertyList>
\ No newline at end of file