From b2723f1d75a8da36dd3481fbd75aeaa83ad547cc Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 27 Jun 2017 13:43:22 -0400
Subject: [PATCH] A3XX: New FADEC simulated, N1 Mode working (except limit on
 ECAM

---
 A318-100-CFM-set.xml                          |    3 +
 A319-100-CFM-set.xml                          |    3 +
 A319-100-IAE-set.xml                          |    3 +
 A320-100-CFM-set.xml                          |    3 +
 A320-200-CFM-set.xml                          |    3 +
 A320-200-IAE-set.xml                          |    3 +
 A320-main.xml                                 |    2 +-
 A320neo-CFM-set.xml                           |    3 +
 A321-200-CFM-set.xml                          |    3 +
 A321-200-IAE-set.xml                          |    3 +
 A321neo-CFM-set.xml                           |    3 +
 Models/Instruments/OHpanel/OHpanelEPR.xml     |  114 +
 Models/Instruments/OHpanel/res/ohpanelEPR.ac  |  144 +-
 .../Upper-ECAM-EIS2/Upper-ECAM-CFM.xml        |  264 ++-
 .../Upper-ECAM-EIS2/Upper-ECAM-IAE.xml        |  452 +++-
 .../Upper-ECAM-EIS2/resCFM/eicasCFM.ac        |  197 +-
 .../Upper-ECAM-EIS2/resIAE/eicasIAE.ac        | 2003 +++++++++++++++-
 .../Instruments/Upper-ECAM/Upper-ECAM-CFM.xml |  264 ++-
 .../Instruments/Upper-ECAM/Upper-ECAM-IAE.xml |  452 +++-
 .../Instruments/Upper-ECAM/resCFM/eicasCFM.ac |  129 +-
 .../Instruments/Upper-ECAM/resIAE/eicasIAE.ac | 2107 +++++++++++++++--
 Nasal/fadec-cfm.nas                           |   90 +
 Nasal/{fadec.nas => fadec-common.nas}         |    3 +-
 Nasal/fadec-iae.nas                           |  132 ++
 Nasal/libraries.nas                           |    2 +
 Systems/fadec-iae.xml                         |   34 +
 26 files changed, 5611 insertions(+), 808 deletions(-)
 create mode 100644 Nasal/fadec-cfm.nas
 rename Nasal/{fadec.nas => fadec-common.nas} (98%)
 create mode 100644 Nasal/fadec-iae.nas

diff --git a/A318-100-CFM-set.xml b/A318-100-CFM-set.xml
index 1e14f2eb..b58be9ef 100644
--- a/A318-100-CFM-set.xml
+++ b/A318-100-CFM-set.xml
@@ -133,6 +133,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a318livery-cfm.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml
index da1f8fea..5a2c24ff 100644
--- a/A319-100-CFM-set.xml
+++ b/A319-100-CFM-set.xml
@@ -138,6 +138,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a319livery-cfm.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml
index 2e63d94b..1bfdf7ba 100644
--- a/A319-100-IAE-set.xml
+++ b/A319-100-IAE-set.xml
@@ -138,6 +138,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a319livery-iae.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-iae.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
index 82e72017..6e490f83 100644
--- a/A320-100-CFM-set.xml
+++ b/A320-100-CFM-set.xml
@@ -167,5 +167,8 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a320livery-cfm-100.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 </PropertyList>
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 91aa9f0f..0532f992 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -158,5 +158,8 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a320livery-cfm.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 </PropertyList>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index 0715dfdd..e0a18e81 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -158,6 +158,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a320livery-iae.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-iae.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A320-main.xml b/A320-main.xml
index 5f6f071b..c903a9a0 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -812,7 +812,7 @@
 			<file>Aircraft/A320Family/Nasal/ADIRS.nas</file>
 		</systems>
 		<thrust>
-			<file>Aircraft/A320Family/Nasal/fadec.nas</file>
+			<file>Aircraft/A320Family/Nasal/fadec-common.nas</file>
 		</thrust>
 		<fbw>
 			<file>Aircraft/A320Family/Nasal/it-fbw.nas</file>
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index 4c040bc7..01901375 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -148,6 +148,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a320livery-neocfm.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml
index b3142273..9b692c58 100644
--- a/A321-200-CFM-set.xml
+++ b/A321-200-CFM-set.xml
@@ -138,6 +138,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a321livery-cfm.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index 661ae499..6d943203 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -138,6 +138,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a321livery-iae.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-iae.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/A321neo-CFM-set.xml b/A321neo-CFM-set.xml
index a15e21d2..6521c273 100644
--- a/A321neo-CFM-set.xml
+++ b/A321neo-CFM-set.xml
@@ -133,6 +133,9 @@
 		<specific>
 			<file>Aircraft/A320Family/Nasal/a321livery-neocfm.nas</file>
 		</specific>
+		<fadec>
+			<file>Aircraft/A320Family/Nasal/fadec-cfm.nas</file>
+		</fadec>
 	</nasal>
 
 </PropertyList>
diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index e2feabf4..b5ec85d8 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -4,6 +4,120 @@
 
 	<path>res/ohpanelEPR.ac</path>
 	
+	<!-- No button lights without power! -->
+	<animation>
+		<object-name>Eng1N1Btn2O</object-name>
+		<object-name>Eng2N1Btn2O</object-name>
+		<condition>
+			<or>
+				<greater-than-equals>
+					<property>/systems/electrical/bus/dc1</property>
+					<value>25</value>
+				</greater-than-equals>
+				<greater-than-equals>
+					<property>/systems/electrical/bus/dc2</property>
+					<value>25</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<!-- N1 Mode switches -->
+	
+	<animation>
+		<type>pick</type>
+		<object-name>Eng1N1Btn</object-name>
+		<object-name>Eng1N1Btn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
+				<command>property-toggle</command>
+				<property>/controls/fadec/n1mode1</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>Eng1N1Btn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/adirs/adr[2]/off</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/fadec/n1mode1</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>Eng2N1Btn</object-name>
+		<object-name>Eng2N1Btn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
+				<command>property-toggle</command>
+				<property>/controls/fadec/n1mode2</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>Eng2N1Btn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/controls/adirs/adr[2]/off</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/fadec/n1mode2</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
 	<!-- Panel lighting -->
 	<animation>
 		<name>Panel lighting select</name>
diff --git a/Models/Instruments/OHpanel/res/ohpanelEPR.ac b/Models/Instruments/OHpanel/res/ohpanelEPR.ac
index 89e71042..40761e9e 100644
--- a/Models/Instruments/OHpanel/res/ohpanelEPR.ac
+++ b/Models/Instruments/OHpanel/res/ohpanelEPR.ac
@@ -2,7 +2,7 @@ AC3Db
 MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157  amb 0.2 0.2 0.2  emis 1 1 1  spec 0 0 0  shi 128  trans 0
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 0 0 0  spec 1 1 1  shi 128  trans 0
 OBJECT world
-kids 3
+kids 5
 OBJECT poly
 name "Eng1N1Btn"
 loc 0.000113685 -5.00064e-005 -4.99785e-005
@@ -180,3 +180,145 @@ refs 4
 2 0.850769 0.217645
 0 0.850769 0.140175
 kids 0
+OBJECT poly
+name "Eng1N1Btn2O"
+loc 0.000282234 -5.00064e-005 -4.99785e-005
+data 8
+Cube.092
+texture "buttons2.png"
+crease 30.000000
+numvert 12
+0.006747 -0.2257 -0.274672
+0.004267 -0.2257 -0.254826
+0.00129 -0.2257 -0.255198
+0.003771 -0.2257 -0.275044
+0.006747 -0.2157 -0.274672
+0.004267 -0.2157 -0.254826
+0.00129 -0.2157 -0.255198
+0.003771 -0.2157 -0.275044
+0.003771 -0.2157 -0.275044
+0.00129 -0.2157 -0.255198
+0.004267 -0.2157 -0.254826
+0.006747 -0.2157 -0.274672
+numsurf 7
+SURF 0x0
+mat 0
+refs 4
+10 1.38778e-013 0.75
+5 0 0.75
+4 0.5 0.75
+11 0.5 0.75
+SURF 0x0
+mat 0
+refs 4
+9 1.38778e-013 0.75
+6 0 0.75
+5 0 0.75
+10 1.38778e-013 0.75
+SURF 0x0
+mat 0
+refs 4
+11 0.5 0.75
+4 0.5 0.75
+7 0.5 0.75
+8 0.5 0.75
+SURF 0x0
+mat 0
+refs 4
+0 0.5 0.5
+1 0 0.5
+2 0 0.5
+3 0.5 0.5
+SURF 0x0
+mat 0
+refs 4
+0 0.5 0.5
+4 0.5 0.75
+5 9.31321e-008 0.75
+1 0 0.5
+SURF 0x0
+mat 0
+refs 4
+1 0 0.5
+5 9.31321e-008 0.75
+6 9.31321e-008 0.75
+2 0 0.5
+SURF 0x0
+mat 0
+refs 4
+4 0.5 0.75
+0 0.5 0.5
+3 0.5 0.5
+7 0.5 0.75
+kids 0
+OBJECT poly
+name "Eng2N1Btn2O"
+loc 0.000282234 -5.00064e-005 -4.99785e-005
+data 8
+Cube.093
+texture "buttons2.png"
+crease 30.000000
+numvert 12
+0.010704 -0.2257 -0.306325
+0.008223 -0.2257 -0.28648
+0.005247 -0.2257 -0.286852
+0.007727 -0.2257 -0.306697
+0.010704 -0.2157 -0.306325
+0.008223 -0.2157 -0.28648
+0.005247 -0.2157 -0.286852
+0.007727 -0.2157 -0.306697
+0.005247 -0.2157 -0.286852
+0.007727 -0.2157 -0.306697
+0.010704 -0.2157 -0.306325
+0.008223 -0.2157 -0.28648
+numsurf 7
+SURF 0x0
+mat 0
+refs 4
+11 1.38778e-013 0.75
+5 0 0.75
+4 0.5 0.75
+10 0.5 0.75
+SURF 0x0
+mat 0
+refs 4
+10 0.5 0.75
+4 0.5 0.75
+7 0.5 0.75
+9 0.5 0.75
+SURF 0x0
+mat 0
+refs 4
+8 1.38778e-013 0.75
+6 0 0.75
+5 0 0.75
+11 1.38778e-013 0.75
+SURF 0x0
+mat 0
+refs 4
+0 0.5 0.5
+1 0 0.5
+2 0 0.5
+3 0.5 0.5
+SURF 0x0
+mat 0
+refs 4
+0 0.5 0.5
+4 0.5 0.75
+5 9.31321e-008 0.75
+1 0 0.5
+SURF 0x0
+mat 0
+refs 4
+1 0 0.5
+5 9.31321e-008 0.75
+6 9.31321e-008 0.75
+2 0 0.5
+SURF 0x0
+mat 0
+refs 4
+4 0.5 0.75
+0 0.5 0.5
+3 0.5 0.5
+7 0.5 0.75
+kids 0
diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
index 8525d0b9..3fde5a61 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
@@ -10,127 +10,195 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.1</object-name>
-		<object-name>XX1</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XXn11</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.2</object-name>
-		<object-name>XX2</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XXn12</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.3</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XXegt1</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.4</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XXegt2</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green1</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XXn21</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.n22</object-name>
+		<object-name>XXn22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n11</object-name>
 		<object-name>n11</object-name>
-		<object-name>egt1</object-name>
 		<object-name>n1limy1</object-name>
 		<object-name>thrpos1</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev1.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green2</object-name>
+		<object-name>txt.n12</object-name>
 		<object-name>n12</object-name>
-		<object-name>egt2</object-name>
 		<object-name>n1limy2</object-name>
 		<object-name>thrpos2</object-name>
 		<object-name>rev2.g</object-name>
 		<object-name>rev2.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green3</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>egt1</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green4</object-name>
+		<object-name>txt.egt2</object-name>
+		<object-name>egt2</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n21</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
@@ -215,10 +283,14 @@
 	<animation>
 		<type>material</type>
 		<object-name>osgtext-green</object-name>
-		<object-name>osgtext-green1</object-name>
-		<object-name>osgtext-green2</object-name>
-		<object-name>osgtext-green3</object-name>
-		<object-name>osgtext-green4</object-name>
+		<object-name>txt.n11</object-name>
+		<object-name>txt.n12</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>txt.egt2</object-name>
+		<object-name>txt.n21</object-name>
+		<object-name>txt.n22</object-name>
+		<object-name>txt.ff1</object-name>
+		<object-name>txt.ff2</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -245,10 +317,14 @@
 	
 	<animation>
 		<type>material</type> <!-- Amber -->
-		<object-name>XX.1</object-name>
-		<object-name>XX.2</object-name>
-		<object-name>XX.3</object-name>
-		<object-name>XX.4</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XX.n22</object-name>
+		<object-name>XX.ff1</object-name>
+		<object-name>XX.ff2</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -327,7 +403,7 @@
 	<!-- N1 -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0265</y-m>
@@ -351,7 +427,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0420</y-m>
@@ -375,7 +451,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0265</y-m>
@@ -399,7 +475,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0420</y-m>
@@ -521,7 +597,7 @@
 	<!-- EGT -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -545,7 +621,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0334</y-m>
@@ -569,7 +645,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -593,7 +669,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0334</y-m>
@@ -619,7 +695,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green3</name>
+		<name>txt.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -643,7 +719,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green4</name>
+		<name>txt.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -667,7 +743,7 @@
 	</text>
 	
 	<text>
-		<name>XX.3</name>
+		<name>XX.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -691,7 +767,7 @@
 	</text>
 	
 	<text>
-		<name>XX.4</name>
+		<name>XX.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -767,7 +843,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -791,7 +867,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -815,7 +891,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -839,7 +915,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0336</y-m>
@@ -939,7 +1015,7 @@
 	<animation>
     	<type>rotate</type>
     	<object-name>n1limy1</object-name>
-    	<property>/controls/engines/n1-limit</property>
+    	<property>/systems/thrust/n1/toga-lim</property>
 		<interpolation>
 			<entry><ind> 22.4</ind><dep>-127</dep></entry>
 			<entry><ind> 50.0</ind><dep> -58</dep></entry>
@@ -961,7 +1037,7 @@
     <animation>
     	<type>rotate</type>
     	<object-name>n1limy2</object-name>
-    	<property>/controls/engines/n1-limit</property>
+    	<property>/systems/thrust/n1/toga-lim</property>
 		<interpolation>
 			<entry><ind> 22.4</ind><dep>-127</dep></entry>
 			<entry><ind> 50.0</ind><dep> -58</dep></entry>
diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
index bc6aef9a..39a0a325 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
@@ -10,175 +10,279 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.1</object-name>
-		<object-name>XX1</object-name>
+		<object-name>XX.epr1</object-name>
+		<object-name>XXepr1</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng1/epr</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.2</object-name>
-		<object-name>XX2</object-name>
+		<object-name>XX.epr2</object-name>
+		<object-name>XXepr2</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng2/epr</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.3</object-name>
-		<object-name>XX3</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XXegt1</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[0]/n1</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.4</object-name>
-		<object-name>XX4</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XXegt2</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[1]/n1</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.5</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XXn11</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.6</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XXn12</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green1</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XXn21</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.n22</object-name>
+		<object-name>XXn22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.epr1</object-name>
 		<object-name>epr1</object-name>
-		<object-name>egt1</object-name>
 		<object-name>eprlimy1</object-name>
 		<object-name>thrpos1</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev1.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng1/epr</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green2</object-name>
+		<object-name>txt.epr2</object-name>
 		<object-name>epr2</object-name>
-		<object-name>egt2</object-name>
 		<object-name>eprlimy2</object-name>
 		<object-name>thrpos2</object-name>
 		<object-name>rev2.g</object-name>
 		<object-name>rev2.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng2/epr</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green3</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>egt1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.egt2</object-name>
+		<object-name>egt2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n11</object-name>
 		<object-name>n11</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[0]/n1</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green4</object-name>
+		<object-name>n1limy1</object-name>
+		<object-name>n1pos1</object-name>
+		<condition>
+			<and>
+				<equals>
+					<property>/systems/fadec/eng1/n1</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/systems/fadec/n1mode1</property>
+					<value>1</value>
+				</equals>
+			</and>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n12</object-name>
 		<object-name>n12</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[1]/n1</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green5</object-name>
+		<object-name>n1limy2</object-name>
+		<object-name>n1pos2</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<and>
+				<equals>
+					<property>/systems/fadec/eng2/n1</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/systems/fadec/n1mode2</property>
+					<value>1</value>
+				</equals>
+			</and>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green6</object-name>
+		<object-name>txt.n21</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
@@ -263,12 +367,16 @@
 	<animation>
 		<type>material</type>
 		<object-name>osgtext-green</object-name>
-		<object-name>osgtext-green1</object-name>
-		<object-name>osgtext-green2</object-name>
-		<object-name>osgtext-green3</object-name>
-		<object-name>osgtext-green4</object-name>
-		<object-name>osgtext-green5</object-name>
-		<object-name>osgtext-green6</object-name>
+		<object-name>txt.epr1</object-name>
+		<object-name>txt.epr2</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>txt.egt2</object-name>
+		<object-name>txt.n11</object-name>
+		<object-name>txt.n12</object-name>
+		<object-name>txt.n21</object-name>
+		<object-name>txt.n22</object-name>
+		<object-name>txt.ff1</object-name>
+		<object-name>txt.ff2</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -295,12 +403,16 @@
 	
 	<animation>
 		<type>material</type> <!-- Amber -->
-		<object-name>XX.1</object-name>
-		<object-name>XX.2</object-name>
-		<object-name>XX.3</object-name>
-		<object-name>XX.4</object-name>
-		<object-name>XX.5</object-name>
-		<object-name>XX.6</object-name>
+		<object-name>XX.epr1</object-name>
+		<object-name>XX.epr2</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XX.n22</object-name>
+		<object-name>XX.ff1</object-name>
+		<object-name>XX.ff2</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -379,7 +491,7 @@
 	<!-- EPR -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.epr1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0265</y-m>
@@ -403,7 +515,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.epr2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0420</y-m>
@@ -427,7 +539,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.epr1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0265</y-m>
@@ -451,7 +563,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.epr2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0420</y-m>
@@ -475,7 +587,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.epr1</name>
 		<offsets>
     		<x-m>0.0004</x-m>
 			<y-m>-0.0345</y-m>
@@ -499,7 +611,7 @@
 	</text>
 
 	<text>
-		<name>XX.2</name>
+		<name>XX.epr2</name>
 		<offsets>
     		<x-m>0.0004</x-m>
     		<y-m>0.0340</y-m>
@@ -621,7 +733,7 @@
 	<!-- EGT -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -645,7 +757,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0334</y-m>
@@ -669,7 +781,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0349</y-m>
@@ -693,7 +805,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0334</y-m>
@@ -719,7 +831,7 @@
 	<!-- N1 -->
 
 	<text>
-		<name>osgtext-green3</name>
+		<name>txt.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0238</y-m>
@@ -743,7 +855,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green4</name>
+		<name>txt.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0450</y-m>
@@ -767,7 +879,7 @@
 	</text>
 	
 	<text>
-		<name>XX.3</name>
+		<name>XX.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0238</y-m>
@@ -791,7 +903,7 @@
 	</text>
 	
 	<text>
-		<name>XX.4</name>
+		<name>XX.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0450</y-m>
@@ -817,7 +929,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green5</name>
+		<name>txt.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -841,7 +953,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green6</name>
+		<name>txt.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -865,7 +977,7 @@
 	</text>
 	
 	<text>
-		<name>XX.5</name>
+		<name>XX.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -889,7 +1001,7 @@
 	</text>
 	
 	<text>
-		<name>XX.6</name>
+		<name>XX.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -965,7 +1077,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -989,7 +1101,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -1013,7 +1125,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.069</y-m>
@@ -1037,7 +1149,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.069</y-m>
@@ -1141,7 +1253,7 @@
 	<animation>
     	<type>rotate</type>
     	<object-name>eprlimy1</object-name>
-    	<property>/controls/engines/epr-limit</property>
+    	<property>/systems/thrust/epr/toga-lim</property>
 		<interpolation>
 			<entry><ind>0.990</ind><dep>-129</dep></entry>
 			<entry><ind>1.000</ind><dep>-120</dep></entry>
@@ -1165,7 +1277,7 @@
     <animation>
     	<type>rotate</type>
     	<object-name>eprlimy2</object-name>
-    	<property>/controls/engines/epr-limit</property>
+    	<property>/systems/thrust/epr/toga-lim</property>
 		<interpolation>
 			<entry><ind>0.990</ind><dep>-129</dep></entry>
 			<entry><ind>1.000</ind><dep>-120</dep></entry>
@@ -1323,6 +1435,94 @@
     		<z>0</z>
     	</axis>
     </animation>
+	
+	<animation>
+    	<type>rotate</type>
+    	<object-name>n1limy1</object-name>
+    	<property>/systems/thrust/n1/toga-lim</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  65</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.00237</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
+    
+    <animation>
+    	<type>rotate</type>
+    	<object-name>n1limy2</object-name>
+    	<property>/systems/thrust/n1/toga-lim</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  65</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>0.0335</y-m>
+    		<z-m>0.00237</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
+	
+	<animation>
+    	<type>rotate</type>
+    	<object-name>n1pos1</object-name>
+    	<property>/engines/engine[0]/n1-cmd</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  65</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.00237</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
+    
+    <animation>
+    	<type>rotate</type>
+    	<object-name>n1pos2</object-name>
+    	<property>/engines/engine[1]/n1-cmd</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  65</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>0.0335</y-m>
+    		<z-m>0.00237</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
     
     <!-- Flaps Indicator -->
 	
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
index aabe09d5..29d6b739 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
+++ b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
@@ -5,7 +5,7 @@ MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647
 MATERIAL "Material.001" rgb 0.8 0.5614 0  amb 1 1 1  emis 0.8 0.8 0.8  spec 0.5 0.5 0.5  shi 50  trans 0
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 1 1 1  spec 1 1 1  shi 0  trans 0
 OBJECT world
-kids 14
+kids 16
 OBJECT poly
 name "egt2"
 loc 0.000492332 0.0384328 -0.0334988
@@ -1980,80 +1980,6 @@ refs 3
 13 0.0309113 0.963318
 kids 0
 OBJECT poly
-name "XX2"
-loc 2.26668e-005 -0.0851298 -0.51126
-texture "eicasCFM-extra.png"
-crease 45.000000
-numvert 8
-0 0.104181 0.495741
-0 0.158964 0.495741
-0 0.161764 0.495741
-0 0.160981 0.495741
-0 0.104181 0.460072
-0 0.15897 0.460072
-0 0.159817 0.460072
-0 0.161764 0.460072
-numsurf 3
-SURF 0x10
-mat 0
-refs 4
-7 0.81184 0.980871
-2 0.594542 0.980871
-3 0.594542 0.975991
-6 0.81184 0.968729
-SURF 0x10
-mat 0
-refs 4
-6 0.81184 0.968729
-3 0.594542 0.975991
-1 0.594542 0.963409
-5 0.81184 0.963444
-SURF 0x10
-mat 0
-refs 4
-5 0.81184 0.963444
-1 0.594542 0.963409
-0 0.594542 0.621658
-4 0.81184 0.621658
-kids 0
-OBJECT poly
-name "XX1"
-loc 2.26668e-005 -0.0851298 -0.51126
-texture "eicasCFM-extra.png"
-crease 45.000000
-numvert 8
-0 0.161764 0.56434
-0 0.136018 0.56434
-0 0.158954 0.56434
-0 0.104181 0.56434
-0 0.161764 0.527829
-0 0.104181 0.527829
-0 0.158959 0.527829
-0 0.104181 0.531131
-numsurf 3
-SURF 0x10
-mat 0
-refs 3
-3 0.176631 0.621658
-7 0.378944 0.621658
-1 0.176631 0.820266
-SURF 0x10
-mat 0
-refs 5
-1 0.176631 0.820266
-7 0.378944 0.621658
-5 0.399062 0.621658
-6 0.399062 0.963377
-2 0.176631 0.963341
-SURF 0x10
-mat 0
-refs 4
-2 0.176631 0.963341
-6 0.399062 0.963377
-4 0.399061 0.98087
-0 0.176631 0.98087
-kids 0
-OBJECT poly
 name "n11"
 loc 0.000492332 0.0671124 0.0351023
 data 10
@@ -2074,3 +2000,124 @@ refs 4
 1 4.45843e-005 0.000756443
 2 1.00067 0.000756443
 kids 0
+OBJECT poly
+name "XXn11"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasCFM-extra.png"
+crease 45.000000
+numvert 8
+0 0.130943 0.527829
+0 0.130943 0.56434
+0 0.130943 0.559046
+0 0.158959 0.527829
+0 0.161764 0.527829
+0 0.158954 0.56434
+0 0.136018 0.56434
+0 0.161764 0.56434
+numsurf 3
+SURF 0x10
+mat 0
+refs 4
+5 0.176631 0.963341
+3 0.399062 0.963377
+4 0.399061 0.98087
+7 0.176631 0.98087
+SURF 0x10
+mat 0
+refs 3
+2 0.208881 0.788607
+6 0.176631 0.820266
+1 0.176631 0.788607
+SURF 0x10
+mat 0
+refs 5
+0 0.399062 0.788606
+3 0.399062 0.963377
+5 0.176631 0.963341
+6 0.176631 0.820266
+2 0.208881 0.788607
+kids 0
+OBJECT poly
+name "XXegt1"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasCFM-extra.png"
+crease 45.000000
+numvert 6
+0 0.104181 0.56434
+0 0.104181 0.527829
+0 0.104181 0.531131
+0 0.130943 0.559046
+0 0.130943 0.56434
+0 0.130943 0.527829
+numsurf 2
+SURF 0x10
+mat 0
+refs 4
+3 0.208881 0.788607
+2 0.378944 0.621658
+1 0.399062 0.621658
+5 0.399062 0.788606
+SURF 0x10
+mat 0
+refs 4
+4 0.176631 0.788607
+0 0.176631 0.621658
+2 0.378944 0.621658
+3 0.208881 0.788607
+kids 0
+OBJECT poly
+name "XXn12"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasCFM-extra.png"
+crease 45.000000
+numvert 8
+0 0.130943 0.495741
+0 0.130943 0.460072
+0 0.161764 0.460072
+0 0.159817 0.460072
+0 0.15897 0.460072
+0 0.160981 0.495741
+0 0.161764 0.495741
+0 0.158964 0.495741
+numsurf 3
+SURF 0x10
+mat 0
+refs 4
+3 0.81184 0.968729
+5 0.594542 0.975991
+7 0.594542 0.963409
+4 0.81184 0.963444
+SURF 0x10
+mat 0
+refs 4
+2 0.81184 0.980871
+6 0.594542 0.980871
+5 0.594542 0.975991
+3 0.81184 0.968729
+SURF 0x10
+mat 0
+refs 4
+1 0.81184 0.788605
+4 0.81184 0.963444
+7 0.594542 0.963409
+0 0.594542 0.788606
+kids 0
+OBJECT poly
+name "XXegt2"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasCFM-extra.png"
+crease 45.000000
+numvert 4
+0 0.104181 0.495741
+0 0.104181 0.460072
+0 0.130943 0.460072
+0 0.130943 0.495741
+numsurf 1
+SURF 0x10
+mat 0
+refs 4
+3 0.594542 0.788606
+0 0.594542 0.621658
+1 0.81184 0.621658
+2 0.81184 0.788605
+kids 0
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
index 15e66308..fa5bf8e0 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
+++ b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
@@ -5,7 +5,1778 @@ MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647
 MATERIAL "Material.001" rgb 0.8 0.5614 0  amb 1 1 1  emis 0.8 0.8 0.8  spec 0.5 0.5 0.5  shi 50  trans 0
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 1 1 1  spec 1 1 1  shi 0  trans 0
 OBJECT world
-kids 18
+kids 26
+OBJECT poly
+name "n1limy2"
+loc 0.000387976 0.0181326 -0.0386478
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 -0.000980854 0.00380089
+0 -0.000956118 0.00466734
+0 0.000608288 0.00373316
+0 0.000633299 0.00459963
+numsurf 1
+SURF 0x20
+mat 3
+refs 4
+0 0 0
+2 0 0
+3 0 0
+1 0 0
+kids 0
+OBJECT poly
+name "n1pos2"
+loc 0.000418952 0.0193346 -0.0334991
+crease 45.000000
+numvert 61
+0 0 -0.000599384
+0 6.26519e-005 -0.000596091
+0 0.000124618 -0.000586286
+0 0.000185221 -0.000570036
+0 0.000243783 -0.000547573
+0 0.000299692 -0.000519082
+0 0.000352308 -0.000484906
+0 0.000401057 -0.00044544
+0 0.000445426 -0.000401065
+0 0.000484906 -0.000352308
+0 0.000519082 -0.000299692
+0 0.000547551 -0.000243783
+0 0.000570044 -0.000185229
+0 0.000586279 -0.000124618
+0 0.000596091 -6.26594e-005
+0 0.000599377 0
+0 0.000596091 6.26594e-005
+0 0.000586279 0.000124618
+0 0.000570044 0.000185229
+0 0.000547551 0.000243783
+0 0.000519082 0.000299692
+0 0.000484906 0.000352308
+0 0.000445426 0.000401065
+0 0.000401057 0.00044544
+0 0.000352308 0.000484906
+0 0.000299692 0.000519082
+0 0.000243783 0.000547573
+0 0.000185221 0.000570036
+0 0.000124618 0.000586286
+0 6.26519e-005 0.000596091
+0 0 0.000599384
+0 -6.26519e-005 0.000596091
+0 -0.000124618 0.000586286
+0 -0.000185221 0.000570036
+0 -0.000243783 0.000547573
+0 -0.000299692 0.000519082
+0 -0.000352308 0.000484906
+0 -0.000401057 0.00044544
+0 -0.000445426 0.000401065
+0 -0.000484906 0.000352308
+0 -0.000519082 0.000299692
+0 -0.000547551 0.000243783
+0 -0.000570044 0.000185229
+0 -0.000586279 0.000124618
+0 -0.000596091 6.26594e-005
+0 -0.000599377 0
+0 -0.000596091 -6.26594e-005
+0 -0.000586279 -0.000124618
+0 -0.000570044 -0.000185229
+0 -0.000547551 -0.000243783
+0 -0.000519082 -0.000299692
+0 -0.000484906 -0.000352308
+0 -0.000445426 -0.000401065
+0 -0.000401057 -0.00044544
+0 -0.000352308 -0.000484921
+0 -0.000299692 -0.000519082
+0 -0.000243783 -0.000547573
+0 -0.000185221 -0.000570036
+0 -0.000124618 -0.000586286
+0 -6.26519e-005 -0.000596091
+0 0 0
+numsurf 60
+SURF 0x30
+mat 1
+refs 3
+0 1 0.5
+1 0.997261 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+1 0.997261 0.552264
+2 0.989074 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+2 0.989074 0.603956
+3 0.975528 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+3 0.975528 0.654508
+4 0.956773 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+4 0.956773 0.703368
+5 0.933013 0.75
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+5 0.933013 0.75
+6 0.904508 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+6 0.904508 0.793893
+7 0.871572 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+7 0.871572 0.834565
+8 0.834565 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+8 0.834565 0.871572
+9 0.793893 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+9 0.793893 0.904508
+10 0.75 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+10 0.75 0.933013
+11 0.703368 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+11 0.703368 0.956773
+12 0.654508 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+12 0.654508 0.975528
+13 0.603956 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+13 0.603956 0.989074
+14 0.552264 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+14 0.552264 0.997261
+15 0.5 1
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+15 0.5 1
+16 0.447736 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+16 0.447736 0.997261
+17 0.396044 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+17 0.396044 0.989074
+18 0.345491 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+18 0.345491 0.975528
+19 0.296632 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+19 0.296632 0.956773
+20 0.25 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+20 0.25 0.933013
+21 0.206107 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+21 0.206107 0.904508
+22 0.165435 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+22 0.165435 0.871572
+23 0.128428 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+23 0.128428 0.834565
+24 0.0954915 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+24 0.0954915 0.793893
+25 0.0669873 0.75
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+25 0.0669873 0.75
+26 0.0432273 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+26 0.0432273 0.703368
+27 0.0244717 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+27 0.0244717 0.654508
+28 0.0109262 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+28 0.0109262 0.603956
+29 0.00273907 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+29 0.00273907 0.552264
+30 0 0.5
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+30 0 0.5
+31 0.00273907 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+31 0.00273907 0.447736
+32 0.0109262 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+32 0.0109262 0.396044
+33 0.0244718 0.345491
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+33 0.0244718 0.345491
+34 0.0432273 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+34 0.0432273 0.296632
+35 0.0669874 0.25
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+35 0.0669874 0.25
+36 0.0954915 0.206107
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+36 0.0954915 0.206107
+37 0.128428 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+37 0.128428 0.165435
+38 0.165435 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+38 0.165435 0.128428
+39 0.206107 0.0954914
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+39 0.206107 0.0954914
+40 0.25 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+40 0.25 0.0669873
+41 0.296632 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+41 0.296632 0.0432273
+42 0.345491 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+42 0.345491 0.0244718
+43 0.396044 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+43 0.396044 0.0109262
+44 0.447736 0.00273904
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+44 0.447736 0.00273904
+45 0.5 0
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+45 0.5 0
+46 0.552264 0.00273907
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+46 0.552264 0.00273907
+47 0.603956 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+47 0.603956 0.0109262
+48 0.654509 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+48 0.654509 0.0244718
+49 0.703368 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+49 0.703368 0.0432273
+50 0.75 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+50 0.75 0.0669873
+51 0.793893 0.0954916
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+51 0.793893 0.0954916
+52 0.834565 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+52 0.834565 0.128428
+53 0.871572 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+53 0.871572 0.165435
+54 0.904509 0.206108
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+54 0.904509 0.206108
+55 0.933013 0.25
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+55 0.933013 0.25
+56 0.956773 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+56 0.956773 0.296632
+57 0.975528 0.345492
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+57 0.975528 0.345492
+58 0.989074 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+58 0.989074 0.396044
+59 0.997261 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+59 0.997261 0.447736
+0 1 0.5
+60 0.5 0.5
+kids 0
+OBJECT poly
+name "n1pos2"
+loc 0.000409974 0.0193346 -0.0334991
+crease 45.000000
+numvert 61
+0 0 0
+0 -9.86606e-005 -0.000938661
+0 -0.000196241 -0.000923224
+0 -0.00029166 -0.000897638
+0 -0.000383899 -0.000862263
+0 -0.00047192 -0.000817388
+0 -0.00055477 -0.000763595
+0 -0.000631556 -0.000701435
+0 -0.000701398 -0.000631548
+0 -0.00076358 -0.00055477
+0 -0.000817388 -0.00047192
+0 -0.000862226 -0.000383884
+0 -0.000897646 -0.000291668
+0 -0.000923216 -0.000196233
+0 -0.000938661 -9.86606e-005
+0 -0.00094384 0
+0 -0.000938661 9.86606e-005
+0 -0.000923216 0.000196233
+0 -0.000897646 0.000291668
+0 -0.000862226 0.000383884
+0 -0.000817388 0.00047192
+0 -0.00076358 0.00055477
+0 -0.000701398 0.000631548
+0 -0.000631556 0.000701435
+0 -0.00055477 0.000763573
+0 -0.00047192 0.000817388
+0 -0.000383899 0.000862263
+0 -0.00029166 0.000897638
+0 -0.000196241 0.000923224
+0 -9.86606e-005 0.000938661
+0 0 0.00094384
+0 9.86606e-005 0.000938661
+0 0.000196241 0.000923224
+0 0.00029166 0.000897638
+0 0.000383899 0.000862263
+0 0.00047192 0.000817388
+0 0.00055477 0.000763573
+0 0.000631556 0.000701435
+0 0.000701398 0.000631548
+0 0.00076358 0.00055477
+0 0.000817388 0.00047192
+0 0.000862226 0.000383884
+0 0.000897646 0.000291668
+0 0.000923216 0.000196233
+0 0.000938661 9.86606e-005
+0 0.00094384 0
+0 0.000938661 -9.86606e-005
+0 0.000923216 -0.000196233
+0 0.000897646 -0.000291668
+0 0.000862226 -0.000383884
+0 0.000817388 -0.00047192
+0 0.00076358 -0.00055477
+0 0.000701398 -0.000631548
+0 0.000631556 -0.000701435
+0 0.00055477 -0.000763573
+0 0.00047192 -0.000817388
+0 0.000383899 -0.000862263
+0 0.00029166 -0.000897638
+0 0.000196241 -0.000923224
+0 9.86606e-005 -0.000938661
+0 0 -0.00094384
+numsurf 60
+SURF 0x30
+mat 2
+refs 3
+1 0.997261 0.447736
+60 1 0.5
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+2 0.989074 0.396044
+1 0.997261 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+3 0.975528 0.345492
+2 0.989074 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+4 0.956773 0.296632
+3 0.975528 0.345492
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+5 0.933013 0.25
+4 0.956773 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+6 0.904509 0.206108
+5 0.933013 0.25
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+7 0.871572 0.165435
+6 0.904509 0.206108
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+8 0.834565 0.128428
+7 0.871572 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+9 0.793893 0.0954916
+8 0.834565 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+10 0.75 0.0669873
+9 0.793893 0.0954916
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+11 0.703368 0.0432273
+10 0.75 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+12 0.654509 0.0244718
+11 0.703368 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+13 0.603956 0.0109262
+12 0.654509 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+14 0.552264 0.00273907
+13 0.603956 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+15 0.5 0
+14 0.552264 0.00273907
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+16 0.447736 0.00273904
+15 0.5 0
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+17 0.396044 0.0109262
+16 0.447736 0.00273904
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+18 0.345491 0.0244718
+17 0.396044 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+19 0.296632 0.0432273
+18 0.345491 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+20 0.25 0.0669873
+19 0.296632 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+21 0.206107 0.0954914
+20 0.25 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+22 0.165435 0.128428
+21 0.206107 0.0954914
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+23 0.128428 0.165435
+22 0.165435 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+24 0.0954915 0.206107
+23 0.128428 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+25 0.0669874 0.25
+24 0.0954915 0.206107
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+26 0.0432273 0.296632
+25 0.0669874 0.25
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+27 0.0244718 0.345491
+26 0.0432273 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+28 0.0109262 0.396044
+27 0.0244718 0.345491
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+29 0.00273907 0.447736
+28 0.0109262 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+30 0 0.5
+29 0.00273907 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+31 0.00273907 0.552264
+30 0 0.5
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+32 0.0109262 0.603956
+31 0.00273907 0.552264
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+33 0.0244717 0.654508
+32 0.0109262 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+34 0.0432273 0.703368
+33 0.0244717 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+35 0.0669873 0.75
+34 0.0432273 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+36 0.0954915 0.793893
+35 0.0669873 0.75
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+37 0.128428 0.834565
+36 0.0954915 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+38 0.165435 0.871572
+37 0.128428 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+39 0.206107 0.904508
+38 0.165435 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+40 0.25 0.933013
+39 0.206107 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+41 0.296632 0.956773
+40 0.25 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+42 0.345491 0.975528
+41 0.296632 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+43 0.396044 0.989074
+42 0.345491 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+44 0.447736 0.997261
+43 0.396044 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+45 0.5 1
+44 0.447736 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+46 0.552264 0.997261
+45 0.5 1
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+47 0.603956 0.989074
+46 0.552264 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+48 0.654508 0.975528
+47 0.603956 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+49 0.703368 0.956773
+48 0.654508 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+50 0.75 0.933013
+49 0.703368 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+51 0.793893 0.904508
+50 0.75 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+52 0.834565 0.871572
+51 0.793893 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+53 0.871572 0.834565
+52 0.834565 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+54 0.904508 0.793893
+53 0.871572 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+55 0.933013 0.75
+54 0.904508 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+56 0.956773 0.703368
+55 0.933013 0.75
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+57 0.975528 0.654508
+56 0.956773 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+58 0.989074 0.603956
+57 0.975528 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+59 0.997261 0.552264
+58 0.989074 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+60 1 0.5
+59 0.997261 0.552264
+0 0.5 0.5
+kids 0
+OBJECT poly
+name "n12"
+loc 0.000596688 0.0104659 -0.0334988
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00936089 0.000477958
+0 -0.00856978 0.000477958
+0 -0.00856978 -0.000478942
+0 0.00936089 -0.000478942
+numsurf 1
+SURF 0x0
+mat 4
+refs 4
+3 1.00067 0.999407
+0 4.45843e-005 0.999407
+1 4.45843e-005 0.000756443
+2 1.00067 0.000756443
+kids 0
+OBJECT poly
+name "n1limy1"
+loc 0.00028362 0.0181325 0.0299533
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 0.000633299 0.00459963
+0 0.000608288 0.00373316
+0 -0.000956118 0.00466734
+0 -0.000980854 0.00380089
+numsurf 1
+SURF 0x20
+mat 3
+refs 4
+3 0 0
+1 0 0
+0 0 0
+2 0 0
+kids 0
+OBJECT poly
+name "n1pos1"
+loc 0.000314596 0.0193346 0.035102
+crease 45.000000
+numvert 61
+0 0 0
+0 -6.26519e-005 -0.000596091
+0 -0.000124618 -0.000586286
+0 -0.000185221 -0.000570036
+0 -0.000243783 -0.000547573
+0 -0.000299692 -0.000519082
+0 -0.000352308 -0.000484921
+0 -0.000401057 -0.00044544
+0 -0.000445426 -0.000401065
+0 -0.000484906 -0.000352308
+0 -0.000519082 -0.000299692
+0 -0.000547551 -0.000243783
+0 -0.000570044 -0.000185229
+0 -0.000586279 -0.000124618
+0 -0.000596091 -6.26594e-005
+0 -0.000599377 0
+0 -0.000596091 6.26594e-005
+0 -0.000586279 0.000124618
+0 -0.000570044 0.000185229
+0 -0.000547551 0.000243783
+0 -0.000519082 0.000299692
+0 -0.000484906 0.000352308
+0 -0.000445426 0.000401065
+0 -0.000401057 0.00044544
+0 -0.000352308 0.000484906
+0 -0.000299692 0.000519082
+0 -0.000243783 0.000547573
+0 -0.000185221 0.000570036
+0 -0.000124618 0.000586286
+0 -6.26519e-005 0.000596091
+0 0 0.000599384
+0 6.26519e-005 0.000596091
+0 0.000124618 0.000586286
+0 0.000185221 0.000570036
+0 0.000243783 0.000547573
+0 0.000299692 0.000519082
+0 0.000352308 0.000484906
+0 0.000401057 0.00044544
+0 0.000445426 0.000401065
+0 0.000484906 0.000352308
+0 0.000519082 0.000299692
+0 0.000547551 0.000243783
+0 0.000570044 0.000185229
+0 0.000586279 0.000124618
+0 0.000596091 6.26594e-005
+0 0.000599377 0
+0 0.000596091 -6.26594e-005
+0 0.000586279 -0.000124618
+0 0.000570044 -0.000185229
+0 0.000547551 -0.000243783
+0 0.000519082 -0.000299692
+0 0.000484906 -0.000352308
+0 0.000445426 -0.000401065
+0 0.000401057 -0.00044544
+0 0.000352308 -0.000484906
+0 0.000299692 -0.000519082
+0 0.000243783 -0.000547573
+0 0.000185221 -0.000570036
+0 0.000124618 -0.000586286
+0 6.26519e-005 -0.000596091
+0 0 -0.000599384
+numsurf 60
+SURF 0x30
+mat 1
+refs 3
+1 0.997261 0.447736
+60 1 0.5
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+2 0.989074 0.396044
+1 0.997261 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+3 0.975528 0.345492
+2 0.989074 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+4 0.956773 0.296632
+3 0.975528 0.345492
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+5 0.933013 0.25
+4 0.956773 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+6 0.904509 0.206108
+5 0.933013 0.25
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+7 0.871572 0.165435
+6 0.904509 0.206108
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+8 0.834565 0.128428
+7 0.871572 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+9 0.793893 0.0954916
+8 0.834565 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+10 0.75 0.0669873
+9 0.793893 0.0954916
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+11 0.703368 0.0432273
+10 0.75 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+12 0.654509 0.0244718
+11 0.703368 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+13 0.603956 0.0109262
+12 0.654509 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+14 0.552264 0.00273907
+13 0.603956 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+15 0.5 0
+14 0.552264 0.00273907
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+16 0.447736 0.00273904
+15 0.5 0
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+17 0.396044 0.0109262
+16 0.447736 0.00273904
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+18 0.345491 0.0244718
+17 0.396044 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+19 0.296632 0.0432273
+18 0.345491 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+20 0.25 0.0669873
+19 0.296632 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+21 0.206107 0.0954914
+20 0.25 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+22 0.165435 0.128428
+21 0.206107 0.0954914
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+23 0.128428 0.165435
+22 0.165435 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+24 0.0954915 0.206107
+23 0.128428 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+25 0.0669874 0.25
+24 0.0954915 0.206107
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+26 0.0432273 0.296632
+25 0.0669874 0.25
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+27 0.0244718 0.345491
+26 0.0432273 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+28 0.0109262 0.396044
+27 0.0244718 0.345491
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+29 0.00273907 0.447736
+28 0.0109262 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+30 0 0.5
+29 0.00273907 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+31 0.00273907 0.552264
+30 0 0.5
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+32 0.0109262 0.603956
+31 0.00273907 0.552264
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+33 0.0244717 0.654508
+32 0.0109262 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+34 0.0432273 0.703368
+33 0.0244717 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+35 0.0669873 0.75
+34 0.0432273 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+36 0.0954915 0.793893
+35 0.0669873 0.75
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+37 0.128428 0.834565
+36 0.0954915 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+38 0.165435 0.871572
+37 0.128428 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+39 0.206107 0.904508
+38 0.165435 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+40 0.25 0.933013
+39 0.206107 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+41 0.296632 0.956773
+40 0.25 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+42 0.345491 0.975528
+41 0.296632 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+43 0.396044 0.989074
+42 0.345491 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+44 0.447736 0.997261
+43 0.396044 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+45 0.5 1
+44 0.447736 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+46 0.552264 0.997261
+45 0.5 1
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+47 0.603956 0.989074
+46 0.552264 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+48 0.654508 0.975528
+47 0.603956 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+49 0.703368 0.956773
+48 0.654508 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+50 0.75 0.933013
+49 0.703368 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+51 0.793893 0.904508
+50 0.75 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+52 0.834565 0.871572
+51 0.793893 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+53 0.871572 0.834565
+52 0.834565 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+54 0.904508 0.793893
+53 0.871572 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+55 0.933013 0.75
+54 0.904508 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+56 0.956773 0.703368
+55 0.933013 0.75
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+57 0.975528 0.654508
+56 0.956773 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+58 0.989074 0.603956
+57 0.975528 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+59 0.997261 0.552264
+58 0.989074 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+60 1 0.5
+59 0.997261 0.552264
+0 0.5 0.5
+kids 0
+OBJECT poly
+name "n1pos1"
+loc 0.000305618 0.0193346 0.035102
+crease 45.000000
+numvert 61
+0 0 -0.00094384
+0 9.86606e-005 -0.000938661
+0 0.000196241 -0.000923224
+0 0.00029166 -0.000897638
+0 0.000383899 -0.000862263
+0 0.00047192 -0.000817388
+0 0.00055477 -0.000763573
+0 0.000631556 -0.000701435
+0 0.000701398 -0.000631548
+0 0.00076358 -0.00055477
+0 0.000817388 -0.00047192
+0 0.000862226 -0.000383884
+0 0.000897646 -0.000291668
+0 0.000923216 -0.000196233
+0 0.000938661 -9.86606e-005
+0 0.00094384 0
+0 0.000938661 9.86606e-005
+0 0.000923216 0.000196233
+0 0.000897646 0.000291668
+0 0.000862226 0.000383884
+0 0.000817388 0.00047192
+0 0.00076358 0.00055477
+0 0.000701398 0.000631548
+0 0.000631556 0.000701435
+0 0.00055477 0.000763573
+0 0.00047192 0.000817388
+0 0.000383899 0.000862263
+0 0.00029166 0.000897638
+0 0.000196241 0.000923224
+0 9.86606e-005 0.000938661
+0 0 0.00094384
+0 -9.86606e-005 0.000938661
+0 -0.000196241 0.000923224
+0 -0.00029166 0.000897638
+0 -0.000383899 0.000862263
+0 -0.00047192 0.000817388
+0 -0.00055477 0.000763573
+0 -0.000631556 0.000701435
+0 -0.000701398 0.000631548
+0 -0.00076358 0.00055477
+0 -0.000817388 0.00047192
+0 -0.000862226 0.000383884
+0 -0.000897646 0.000291668
+0 -0.000923216 0.000196233
+0 -0.000938661 9.86606e-005
+0 -0.00094384 0
+0 -0.000938661 -9.86606e-005
+0 -0.000923216 -0.000196233
+0 -0.000897646 -0.000291668
+0 -0.000862226 -0.000383884
+0 -0.000817388 -0.00047192
+0 -0.00076358 -0.00055477
+0 -0.000701398 -0.000631548
+0 -0.000631556 -0.000701435
+0 -0.00055477 -0.000763595
+0 -0.00047192 -0.000817388
+0 -0.000383899 -0.000862263
+0 -0.00029166 -0.000897638
+0 -0.000196241 -0.000923224
+0 -9.86606e-005 -0.000938661
+0 0 0
+numsurf 60
+SURF 0x30
+mat 2
+refs 3
+0 1 0.5
+1 0.997261 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+1 0.997261 0.552264
+2 0.989074 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+2 0.989074 0.603956
+3 0.975528 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+3 0.975528 0.654508
+4 0.956773 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+4 0.956773 0.703368
+5 0.933013 0.75
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+5 0.933013 0.75
+6 0.904508 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+6 0.904508 0.793893
+7 0.871572 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+7 0.871572 0.834565
+8 0.834565 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+8 0.834565 0.871572
+9 0.793893 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+9 0.793893 0.904508
+10 0.75 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+10 0.75 0.933013
+11 0.703368 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+11 0.703368 0.956773
+12 0.654508 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+12 0.654508 0.975528
+13 0.603956 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+13 0.603956 0.989074
+14 0.552264 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+14 0.552264 0.997261
+15 0.5 1
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+15 0.5 1
+16 0.447736 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+16 0.447736 0.997261
+17 0.396044 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+17 0.396044 0.989074
+18 0.345491 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+18 0.345491 0.975528
+19 0.296632 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+19 0.296632 0.956773
+20 0.25 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+20 0.25 0.933013
+21 0.206107 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+21 0.206107 0.904508
+22 0.165435 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+22 0.165435 0.871572
+23 0.128428 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+23 0.128428 0.834565
+24 0.0954915 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+24 0.0954915 0.793893
+25 0.0669873 0.75
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+25 0.0669873 0.75
+26 0.0432273 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+26 0.0432273 0.703368
+27 0.0244717 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+27 0.0244717 0.654508
+28 0.0109262 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+28 0.0109262 0.603956
+29 0.00273907 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+29 0.00273907 0.552264
+30 0 0.5
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+30 0 0.5
+31 0.00273907 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+31 0.00273907 0.447736
+32 0.0109262 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+32 0.0109262 0.396044
+33 0.0244718 0.345491
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+33 0.0244718 0.345491
+34 0.0432273 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+34 0.0432273 0.296632
+35 0.0669874 0.25
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+35 0.0669874 0.25
+36 0.0954915 0.206107
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+36 0.0954915 0.206107
+37 0.128428 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+37 0.128428 0.165435
+38 0.165435 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+38 0.165435 0.128428
+39 0.206107 0.0954914
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+39 0.206107 0.0954914
+40 0.25 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+40 0.25 0.0669873
+41 0.296632 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+41 0.296632 0.0432273
+42 0.345491 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+42 0.345491 0.0244718
+43 0.396044 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+43 0.396044 0.0109262
+44 0.447736 0.00273904
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+44 0.447736 0.00273904
+45 0.5 0
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+45 0.5 0
+46 0.552264 0.00273907
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+46 0.552264 0.00273907
+47 0.603956 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+47 0.603956 0.0109262
+48 0.654509 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+48 0.654509 0.0244718
+49 0.703368 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+49 0.703368 0.0432273
+50 0.75 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+50 0.75 0.0669873
+51 0.793893 0.0954916
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+51 0.793893 0.0954916
+52 0.834565 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+52 0.834565 0.128428
+53 0.871572 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+53 0.871572 0.165435
+54 0.904509 0.206108
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+54 0.904509 0.206108
+55 0.933013 0.25
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+55 0.933013 0.25
+56 0.956773 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+56 0.956773 0.296632
+57 0.975528 0.345492
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+57 0.975528 0.345492
+58 0.989074 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+58 0.989074 0.396044
+59 0.997261 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+59 0.997261 0.447736
+0 1 0.5
+60 0.5 0.5
+kids 0
 OBJECT poly
 name "egt2"
 loc 0.000492332 0.0384328 -0.0334988
@@ -49,38 +1820,17 @@ refs 4
 2 1.00067 0.000756443
 kids 0
 OBJECT poly
-name "n12"
-loc 0.000492332 0.0102473 -0.0334988
-data 10
-enginepane
-texture "needle.png"
-crease 30.000002
-numvert 4
-0 0.00912207 0.000477958
-0 -0.00835114 0.000477958
-0 -0.00835114 -0.000478942
-0 0.00912207 -0.000478942
-numsurf 1
-SURF 0x0
-mat 4
-refs 4
-3 1.00067 0.999407
-0 4.45843e-005 0.999407
-1 4.45843e-005 0.000756443
-2 1.00067 0.000756443
-kids 0
-OBJECT poly
 name "n11"
-loc 0.000492332 0.0102473 0.0351023
+loc 0.000492332 0.0104659 0.0351023
 data 10
 enginepane
 texture "needle.png"
 crease 30.000002
 numvert 4
-0 0.00912207 -0.000478942
-0 -0.00835114 -0.000478942
-0 -0.00835114 0.000477958
-0 0.00912207 0.000477958
+0 0.0093609 -0.000478942
+0 -0.00856978 -0.000478942
+0 -0.00856978 0.000477958
+0 0.0093609 0.000477958
 numsurf 1
 SURF 0x0
 mat 4
@@ -2022,44 +3772,7 @@ refs 3
 13 0.0309113 0.963318
 kids 0
 OBJECT poly
-name "XX2"
-loc 2.26668e-005 -0.0851298 -0.51126
-texture "eicasIAE-extra.png"
-crease 45.000000
-numvert 8
-0 0.104181 0.495741
-0 0.158964 0.495741
-0 0.161764 0.495741
-0 0.160981 0.495741
-0 0.104181 0.460072
-0 0.15897 0.460072
-0 0.159817 0.460072
-0 0.161764 0.460072
-numsurf 3
-SURF 0x10
-mat 0
-refs 4
-7 0.81184 0.980871
-2 0.594542 0.980871
-3 0.594542 0.975991
-6 0.81184 0.968729
-SURF 0x10
-mat 0
-refs 4
-6 0.81184 0.968729
-3 0.594542 0.975991
-1 0.594542 0.963409
-5 0.81184 0.963444
-SURF 0x10
-mat 0
-refs 4
-5 0.81184 0.963444
-1 0.594542 0.963409
-0 0.594542 0.621658
-4 0.81184 0.621658
-kids 0
-OBJECT poly
-name "XX4"
+name "XXn12"
 loc 2.26668e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
@@ -2078,7 +3791,7 @@ refs 4
 3 0.81184 0.478567
 kids 0
 OBJECT poly
-name "XX3"
+name "XXn11"
 loc 2.26668e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
@@ -2106,43 +3819,6 @@ refs 5
 0 0.176631 0.621658
 kids 0
 OBJECT poly
-name "XX1"
-loc 2.26668e-005 -0.0851298 -0.51126
-texture "eicasIAE-extra.png"
-crease 45.000000
-numvert 8
-0 0.161764 0.56434
-0 0.136018 0.56434
-0 0.158954 0.56434
-0 0.104181 0.56434
-0 0.161764 0.527829
-0 0.104181 0.527829
-0 0.158959 0.527829
-0 0.104181 0.531131
-numsurf 3
-SURF 0x10
-mat 0
-refs 3
-3 0.176631 0.621658
-7 0.378944 0.621658
-1 0.176631 0.820266
-SURF 0x10
-mat 0
-refs 5
-1 0.176631 0.820266
-7 0.378944 0.621658
-5 0.399062 0.621658
-6 0.399062 0.963377
-2 0.176631 0.963341
-SURF 0x10
-mat 0
-refs 4
-2 0.176631 0.963341
-6 0.399062 0.963377
-4 0.399061 0.98087
-0 0.176631 0.98087
-kids 0
-OBJECT poly
 name "epr1"
 loc 0.000492332 0.0671124 0.0351023
 data 10
@@ -2163,3 +3839,124 @@ refs 4
 1 4.45843e-005 0.000756443
 2 1.00067 0.000756443
 kids 0
+OBJECT poly
+name "XXepr1"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 8
+0 0.130683 0.527829
+0 0.130683 0.56434
+0 0.130683 0.558776
+0 0.158959 0.527829
+0 0.161764 0.527829
+0 0.158954 0.56434
+0 0.136018 0.56434
+0 0.161764 0.56434
+numsurf 3
+SURF 0x10
+mat 0
+refs 4
+5 0.176631 0.963341
+3 0.399062 0.963377
+4 0.399061 0.98087
+7 0.176631 0.98087
+SURF 0x10
+mat 0
+refs 3
+2 0.21053 0.786987
+6 0.176631 0.820266
+1 0.176631 0.786987
+SURF 0x10
+mat 0
+refs 5
+0 0.399062 0.786987
+3 0.399062 0.963377
+5 0.176631 0.963341
+6 0.176631 0.820266
+2 0.21053 0.786987
+kids 0
+OBJECT poly
+name "XXegt1"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 6
+0 0.104181 0.56434
+0 0.104181 0.527829
+0 0.104181 0.531131
+0 0.130683 0.558776
+0 0.130683 0.56434
+0 0.130683 0.527829
+numsurf 2
+SURF 0x10
+mat 0
+refs 4
+3 0.21053 0.786987
+2 0.378944 0.621658
+1 0.399062 0.621658
+5 0.399062 0.786987
+SURF 0x10
+mat 0
+refs 4
+4 0.176631 0.786987
+0 0.176631 0.621658
+2 0.378944 0.621658
+3 0.21053 0.786987
+kids 0
+OBJECT poly
+name "XXepr2"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 8
+0 0.130683 0.495741
+0 0.130683 0.460072
+0 0.161764 0.460072
+0 0.159817 0.460072
+0 0.15897 0.460072
+0 0.160981 0.495741
+0 0.161764 0.495741
+0 0.158964 0.495741
+numsurf 3
+SURF 0x10
+mat 0
+refs 4
+3 0.81184 0.968729
+5 0.594542 0.975991
+7 0.594542 0.963409
+4 0.81184 0.963444
+SURF 0x10
+mat 0
+refs 4
+2 0.81184 0.980871
+6 0.594542 0.980871
+5 0.594542 0.975991
+3 0.81184 0.968729
+SURF 0x10
+mat 0
+refs 4
+1 0.81184 0.786986
+4 0.81184 0.963444
+7 0.594542 0.963409
+0 0.594542 0.786987
+kids 0
+OBJECT poly
+name "XXegt2"
+loc 2.26668e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 4
+0 0.104181 0.495741
+0 0.104181 0.460072
+0 0.130683 0.460072
+0 0.130683 0.495741
+numsurf 1
+SURF 0x10
+mat 0
+refs 4
+3 0.594542 0.786987
+0 0.594542 0.621658
+1 0.81184 0.621658
+2 0.81184 0.786986
+kids 0
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
index 3f600724..7144c97c 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
@@ -10,127 +10,195 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.1</object-name>
-		<object-name>XX1</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XXn11</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.2</object-name>
-		<object-name>XX2</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XXn12</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.3</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XXegt1</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.4</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XXegt2</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green1</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XXn21</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.n22</object-name>
+		<object-name>XXn22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n11</object-name>
 		<object-name>n11</object-name>
-		<object-name>egt1</object-name>
 		<object-name>n1limy1</object-name>
 		<object-name>thrpos1</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev1.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green2</object-name>
+		<object-name>txt.n12</object-name>
 		<object-name>n12</object-name>
-		<object-name>egt2</object-name>
 		<object-name>n1limy2</object-name>
 		<object-name>thrpos2</object-name>
 		<object-name>rev2.g</object-name>
 		<object-name>rev2.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green3</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>egt1</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green4</object-name>
+		<object-name>txt.egt2</object-name>
+		<object-name>egt2</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n21</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
@@ -215,10 +283,14 @@
 	<animation>
 		<type>material</type>
 		<object-name>osgtext-green</object-name>
-		<object-name>osgtext-green1</object-name>
-		<object-name>osgtext-green2</object-name>
-		<object-name>osgtext-green3</object-name>
-		<object-name>osgtext-green4</object-name>
+		<object-name>txt.n11</object-name>
+		<object-name>txt.n12</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>txt.egt2</object-name>
+		<object-name>txt.n21</object-name>
+		<object-name>txt.n22</object-name>
+		<object-name>txt.ff1</object-name>
+		<object-name>txt.ff2</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -245,10 +317,14 @@
 	
 	<animation>
 		<type>material</type> <!-- Amber -->
-		<object-name>XX.1</object-name>
-		<object-name>XX.2</object-name>
-		<object-name>XX.3</object-name>
-		<object-name>XX.4</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XX.n22</object-name>
+		<object-name>XX.ff1</object-name>
+		<object-name>XX.ff2</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -327,7 +403,7 @@
 	<!-- N1 -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0590</y-m>
@@ -351,7 +427,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0035</y-m>
@@ -375,7 +451,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0590</y-m>
@@ -399,7 +475,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0035</y-m>
@@ -521,7 +597,7 @@
 	<!-- EGT -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0600</y-m>
@@ -545,7 +621,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0035</y-m>
@@ -569,7 +645,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0600</y-m>
@@ -593,7 +669,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0035</y-m>
@@ -619,7 +695,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green3</name>
+		<name>txt.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -643,7 +719,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green4</name>
+		<name>txt.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -667,7 +743,7 @@
 	</text>
 	
 	<text>
-		<name>XX.3</name>
+		<name>XX.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -691,7 +767,7 @@
 	</text>
 	
 	<text>
-		<name>XX.4</name>
+		<name>XX.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -767,7 +843,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -791,7 +867,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -815,7 +891,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -839,7 +915,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -941,7 +1017,7 @@
 	<animation>
     	<type>rotate</type>
     	<object-name>n1limy1</object-name>
-    	<property>/controls/engines/n1-limit</property>
+    	<property>/systems/thrust/n1/toga-lim</property>
 		<interpolation>
 			<entry><ind>  0.0</ind><dep>-116</dep></entry>
 			<entry><ind> 22.4</ind><dep>-116</dep></entry>
@@ -964,7 +1040,7 @@
     <animation>
     	<type>rotate</type>
     	<object-name>n1limy2</object-name>
-    	<property>/controls/engines/n1-limit</property>
+    	<property>/systems/thrust/n1/toga-lim</property>
 		<interpolation>
 			<entry><ind>  0.0</ind><dep>-116</dep></entry>
 			<entry><ind> 22.4</ind><dep>-116</dep></entry>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
index 75260af9..ef8f3dbd 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
@@ -10,175 +10,279 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.1</object-name>
-		<object-name>XX1</object-name>
+		<object-name>XX.epr1</object-name>
+		<object-name>XXepr1</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng1/epr</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.2</object-name>
-		<object-name>XX2</object-name>
+		<object-name>XX.epr2</object-name>
+		<object-name>XXepr2</object-name>
 		<condition>
-			<and>
-				<not-equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</not-equals>
-				<less-than>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</less-than>
-			</and>
+			<equals>
+				<property>/systems/fadec/eng2/epr</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.3</object-name>
-		<object-name>XX3</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XXegt1</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[0]/n1</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.4</object-name>
-		<object-name>XX4</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XXegt2</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[1]/n1</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.5</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XXn11</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>XX.6</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XXn12</object-name>
 		<condition>
-			<less-than>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</less-than>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>0</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green1</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XXn21</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.n22</object-name>
+		<object-name>XXn22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>XX.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>0</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.epr1</object-name>
 		<object-name>epr1</object-name>
-		<object-name>egt1</object-name>
 		<object-name>eprlimy1</object-name>
 		<object-name>thrpos1</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev1.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[0]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng1/epr</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green2</object-name>
+		<object-name>txt.epr2</object-name>
 		<object-name>epr2</object-name>
-		<object-name>egt2</object-name>
 		<object-name>eprlimy2</object-name>
 		<object-name>thrpos2</object-name>
 		<object-name>rev2.g</object-name>
 		<object-name>rev2.y</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>/controls/engines/engine-start-switch</property>
-					<value>2</value>
-				</equals>
-				<greater-than-equals>
-					<property>/engines/engine[1]/n2</property>
-					<value>3.5</value>
-				</greater-than-equals>
-			</or>
+			<equals>
+				<property>/systems/fadec/eng2/epr</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green3</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>egt1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/egt</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.egt2</object-name>
+		<object-name>egt2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/egt</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n11</object-name>
 		<object-name>n11</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[0]/n1</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng1/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green4</object-name>
+		<object-name>n1limy1</object-name>
+		<object-name>n1pos1</object-name>
+		<condition>
+			<and>
+				<equals>
+					<property>/systems/fadec/eng1/n1</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/systems/fadec/n1mode1</property>
+					<value>1</value>
+				</equals>
+			</and>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n12</object-name>
 		<object-name>n12</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[1]/n1</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng2/n1</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green5</object-name>
+		<object-name>n1limy2</object-name>
+		<object-name>n1pos2</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[0]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<and>
+				<equals>
+					<property>/systems/fadec/eng2/n1</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/systems/fadec/n1mode2</property>
+					<value>1</value>
+				</equals>
+			</and>
 		</condition>
 	</animation>
 	
 	<animation>
 		<type>select</type>
-		<object-name>osgtext-green6</object-name>
+		<object-name>txt.n21</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>/engines/engine[1]/n2</property>
-				<value>3.5</value>
-			</greater-than-equals>
+			<equals>
+				<property>/systems/fadec/eng1/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.n22</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/n2</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff1</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng1/ff</property>
+				<value>1</value>
+			</equals>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>txt.ff2</object-name>
+		<condition>
+			<equals>
+				<property>/systems/fadec/eng2/ff</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 	
@@ -263,12 +367,16 @@
 	<animation>
 		<type>material</type>
 		<object-name>osgtext-green</object-name>
-		<object-name>osgtext-green1</object-name>
-		<object-name>osgtext-green2</object-name>
-		<object-name>osgtext-green3</object-name>
-		<object-name>osgtext-green4</object-name>
-		<object-name>osgtext-green5</object-name>
-		<object-name>osgtext-green6</object-name>
+		<object-name>txt.epr1</object-name>
+		<object-name>txt.epr2</object-name>
+		<object-name>txt.egt1</object-name>
+		<object-name>txt.egt2</object-name>
+		<object-name>txt.n11</object-name>
+		<object-name>txt.n12</object-name>
+		<object-name>txt.n21</object-name>
+		<object-name>txt.n22</object-name>
+		<object-name>txt.ff1</object-name>
+		<object-name>txt.ff2</object-name>
 		<object-name>rev1.g</object-name>
 		<object-name>rev2.g</object-name>
 		<diffuse>
@@ -295,12 +403,16 @@
 	
 	<animation>
 		<type>material</type> <!-- Amber -->
-		<object-name>XX.1</object-name>
-		<object-name>XX.2</object-name>
-		<object-name>XX.3</object-name>
-		<object-name>XX.4</object-name>
-		<object-name>XX.5</object-name>
-		<object-name>XX.6</object-name>
+		<object-name>XX.epr1</object-name>
+		<object-name>XX.epr2</object-name>
+		<object-name>XX.egt1</object-name>
+		<object-name>XX.egt2</object-name>
+		<object-name>XX.n11</object-name>
+		<object-name>XX.n12</object-name>
+		<object-name>XX.n21</object-name>
+		<object-name>XX.n22</object-name>
+		<object-name>XX.ff1</object-name>
+		<object-name>XX.ff2</object-name>
         <diffuse>
             <red>1</red>
             <green>0.4</green>
@@ -379,7 +491,7 @@
 	<!-- EPR -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.epr1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0570</y-m>
@@ -403,7 +515,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.epr2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0015</y-m>
@@ -427,7 +539,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.epr1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0580</y-m>
@@ -451,7 +563,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.epr2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0025</y-m>
@@ -475,7 +587,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.epr1</name>
 		<offsets>
     		<x-m>0.0004</x-m>
     		<y-m>-0.0598</y-m>
@@ -499,7 +611,7 @@
 	</text>
 
 	<text>
-		<name>XX.2</name>
+		<name>XX.epr2</name>
 		<offsets>
     		<x-m>0.0004</x-m>
     		<y-m>-0.0042</y-m>
@@ -621,7 +733,7 @@
 	<!-- EGT -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0575</y-m>
@@ -645,7 +757,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.002</y-m>
@@ -669,7 +781,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.egt1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0575</y-m>
@@ -693,7 +805,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.egt2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.002</y-m>
@@ -719,7 +831,7 @@
 	<!-- N1 -->
 
 	<text>
-		<name>osgtext-green3</name>
+		<name>txt.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0580</y-m>
@@ -743,7 +855,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green4</name>
+		<name>txt.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0025</y-m>
@@ -767,7 +879,7 @@
 	</text>
 	
 	<text>
-		<name>XX.3</name>
+		<name>XX.n11</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0580</y-m>
@@ -791,7 +903,7 @@
 	</text>
 	
 	<text>
-		<name>XX.4</name>
+		<name>XX.n12</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0025</y-m>
@@ -817,7 +929,7 @@
 	<!-- N2 -->
 	
 	<text>
-		<name>osgtext-green5</name>
+		<name>txt.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -841,7 +953,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green6</name>
+		<name>txt.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -865,7 +977,7 @@
 	</text>
 	
 	<text>
-		<name>XX.5</name>
+		<name>XX.n21</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.066</y-m>
@@ -889,7 +1001,7 @@
 	</text>
 	
 	<text>
-		<name>XX.6</name>
+		<name>XX.n22</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.00</y-m>
@@ -965,7 +1077,7 @@
 	<!-- FF -->
 	
 	<text>
-		<name>osgtext-green1</name>
+		<name>txt.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0395</y-m>
@@ -989,7 +1101,7 @@
 	</text>
 	
 	<text>
-		<name>osgtext-green2</name>
+		<name>txt.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0605</y-m>
@@ -1013,7 +1125,7 @@
 	</text>
 	
 	<text>
-		<name>XX.1</name>
+		<name>XX.ff1</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0395</y-m>
@@ -1037,7 +1149,7 @@
 	</text>
 	
 	<text>
-		<name>XX.2</name>
+		<name>XX.ff2</name>
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>0.0605</y-m>
@@ -1141,7 +1253,7 @@
 	<animation>
     	<type>rotate</type>
     	<object-name>eprlimy1</object-name>
-    	<property>/controls/engines/epr-limit</property>
+    	<property>/systems/thrust/epr/toga-lim</property>
 		<interpolation>
 			<entry><ind>0.990</ind><dep>-113</dep></entry>
 			<entry><ind>1.000</ind><dep>-105</dep></entry>
@@ -1165,7 +1277,7 @@
     <animation>
     	<type>rotate</type>
     	<object-name>eprlimy2</object-name>
-    	<property>/controls/engines/epr-limit</property>
+    	<property>/systems/thrust/epr/toga-lim</property>
 		<interpolation>
 			<entry><ind>0.990</ind><dep>-113</dep></entry>
 			<entry><ind>1.000</ind><dep>-105</dep></entry>
@@ -1323,6 +1435,94 @@
     		<z>0</z>
     	</axis>
     </animation>
+	
+	<animation>
+    	<type>rotate</type>
+    	<object-name>n1limy1</object-name>
+    	<property>/systems/thrust/n1/toga-lim</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  46</dep></entry>
+			<entry><ind>110.0</ind><dep>  59</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.00187</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
+    
+    <animation>
+    	<type>rotate</type>
+    	<object-name>n1limy2</object-name>
+    	<property>/systems/thrust/n1/toga-lim</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  46</dep></entry>
+			<entry><ind>110.0</ind><dep>  59</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.00187</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
+	
+	<animation>
+    	<type>rotate</type>
+    	<object-name>n1pos1</object-name>
+    	<property>/engines/engine[0]/n1-cmd</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  46</dep></entry>
+			<entry><ind>110.0</ind><dep>  59</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.00187</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
+    
+    <animation>
+    	<type>rotate</type>
+    	<object-name>n1pos2</object-name>
+    	<property>/engines/engine[1]/n1-cmd</property>
+		<interpolation>
+			<entry><ind> 22.4</ind><dep>-107</dep></entry>
+			<entry><ind> 40.0</ind><dep> -61</dep></entry>
+			<entry><ind>100.0</ind><dep>  46</dep></entry>
+			<entry><ind>110.0</ind><dep>  59</dep></entry>
+		</interpolation>
+    	<center>
+    		<x-m>0</x-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.00187</z-m>
+    	</center>
+    	<axis>
+    		<x>-1</x>
+    		<y>0</y>
+    		<z>0</z>
+    	</axis>
+    </animation>
     
     <!-- Flaps Indicator -->
 	
diff --git a/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac b/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac
index ab0ed866..d816a150 100644
--- a/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac
+++ b/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac
@@ -5,7 +5,7 @@ MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647
 MATERIAL "Material.001" rgb 0.8 0.5614 0  amb 1 1 1  emis 0.8 0.8 0.8  spec 0.5 0.5 0.5  shi 50  trans 0
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 1 1 1  spec 1 1 1  shi 0  trans 0
 OBJECT world
-kids 15
+kids 17
 OBJECT poly
 name "n1limy2"
 loc 0.00028362 0.0737064 -0.00098132
@@ -2038,76 +2038,123 @@ refs 3
 13 0.0309113 0.963318
 kids 0
 OBJECT poly
-name "XX1"
+name "XXn11"
 loc 2.42275e-005 -0.0851298 -0.51126
 texture "eicasCFM-extra.png"
 crease 45.000000
 numvert 8
-0 0.10418 0.587734
-0 0.10418 0.554331
-0 0.159779 0.554331
-0 0.159779 0.587734
-0 0.15895 0.587734
-0 0.158446 0.587734
+0 0.131907 0.560052
+0 0.131907 0.587734
+0 0.131907 0.554331
 0 0.158955 0.554331
-0 0.126423 0.554331
+0 0.158446 0.587734
+0 0.15895 0.587734
+0 0.159779 0.587734
+0 0.159779 0.554331
 numsurf 3
 SURF 0x10
 mat 0
 refs 4
-5 0.0341161 0.960172
-7 0.237606 0.760407
-6 0.237606 0.963351
-4 0.0341162 0.963319
+6 0.0341162 0.968487
+5 0.0341162 0.963319
+3 0.237606 0.963351
+7 0.237606 0.968488
 SURF 0x10
 mat 0
-refs 4
-3 0.0341162 0.968487
-4 0.0341162 0.963319
-6 0.237606 0.963351
-2 0.237606 0.968488
+refs 5
+2 0.237606 0.79462
+3 0.237606 0.963351
+5 0.0341162 0.963319
+4 0.0341161 0.960172
+0 0.202756 0.794619
 SURF 0x10
 mat 0
-refs 4
-1 0.237606 0.62165
-7 0.237606 0.760407
-5 0.0341161 0.960172
-0 0.0341161 0.62165
+refs 3
+0 0.202756 0.794619
+4 0.0341161 0.960172
+1 0.0341161 0.794618
 kids 0
 OBJECT poly
-name "XX2"
+name "XXegt1"
 loc 2.42275e-005 -0.0851298 -0.51126
 texture "eicasCFM-extra.png"
 crease 45.000000
-numvert 8
-0 0.10418 0.532558
-0 0.10418 0.53113
-0 0.10418 0.498751
-0 0.159779 0.498751
-0 0.159779 0.532558
-0 0.158959 0.532558
-0 0.105549 0.532558
+numvert 6
+0 0.10418 0.587734
+0 0.10418 0.554331
+0 0.126423 0.554331
+0 0.131907 0.554331
+0 0.131907 0.587734
+0 0.131907 0.560052
+numsurf 2
+SURF 0x10
+mat 0
+refs 5
+4 0.0341161 0.794618
+0 0.0341161 0.62165
+1 0.237606 0.62165
+2 0.237606 0.760407
+5 0.202756 0.794619
+SURF 0x10
+mat 0
+refs 3
+5 0.202756 0.794619
+2 0.237606 0.760407
+3 0.237606 0.79462
+kids 0
+OBJECT poly
+name "XXn12"
+loc 2.42275e-005 -0.0851298 -0.51126
+texture "eicasCFM-extra.png"
+crease 45.000000
+numvert 6
+0 0.131907 0.498751
+0 0.131907 0.532558
 0 0.158964 0.498751
-numsurf 3
+0 0.158959 0.532558
+0 0.159779 0.532558
+0 0.159779 0.498751
+numsurf 2
 SURF 0x10
 mat 0
 refs 4
 4 0.370254 0.968488
-5 0.370254 0.963373
-7 0.576207 0.963406
-3 0.576207 0.968488
+3 0.370254 0.963373
+2 0.576207 0.963406
+5 0.576207 0.968488
+SURF 0x10
+mat 0
+refs 4
+0 0.576207 0.79462
+2 0.576207 0.963406
+3 0.370254 0.963373
+1 0.370254 0.794618
+kids 0
+OBJECT poly
+name "XXegt2"
+loc 2.42275e-005 -0.0851298 -0.51126
+texture "eicasCFM-extra.png"
+crease 45.000000
+numvert 6
+0 0.10418 0.532558
+0 0.10418 0.53113
+0 0.10418 0.498751
+0 0.105549 0.532558
+0 0.131907 0.532558
+0 0.131907 0.498751
+numsurf 2
 SURF 0x10
 mat 0
 refs 5
-2 0.576207 0.621651
-7 0.576207 0.963406
-5 0.370254 0.963373
-6 0.370254 0.630188
+4 0.370254 0.794618
+3 0.370254 0.630188
 1 0.378951 0.62165
+2 0.576207 0.621651
+5 0.576207 0.79462
 SURF 0x10
 mat 0
 refs 3
 1 0.378951 0.62165
-6 0.370254 0.630188
+3 0.370254 0.630188
 0 0.370254 0.62165
 kids 0
diff --git a/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac b/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac
index 65187954..1e932936 100644
--- a/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac
+++ b/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac
@@ -5,7 +5,1778 @@ MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647
 MATERIAL "Material.001" rgb 0.8 0.5614 0  amb 1 1 1  emis 0.8 0.8 0.8  spec 0.5 0.5 0.5  shi 50  trans 0
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 1 1 1  spec 1 1 1  shi 0  trans 0
 OBJECT world
-kids 19
+kids 27
+OBJECT poly
+name "n1limy2"
+loc 0.000387976 0.0176809 -0.000981316
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 -0.000980854 0.00380089
+0 -0.000956118 0.00466734
+0 0.00060828 0.00373316
+0 0.000633299 0.00459963
+numsurf 1
+SURF 0x20
+mat 3
+refs 4
+0 0 0
+2 0 0
+3 0 0
+1 0 0
+kids 0
+OBJECT poly
+name "n1pos2"
+loc 0.000418952 0.018883 0.00416738
+crease 45.000000
+numvert 61
+0 0 -0.000599385
+0 6.26445e-005 -0.000596091
+0 0.000124618 -0.000586286
+0 0.000185221 -0.000570037
+0 0.000243783 -0.000547573
+0 0.000299692 -0.000519082
+0 0.000352308 -0.000484906
+0 0.00040105 -0.000445441
+0 0.000445426 -0.000401065
+0 0.000484899 -0.000352308
+0 0.000519082 -0.000299692
+0 0.000547543 -0.000243783
+0 0.000570044 -0.000185229
+0 0.000586271 -0.000124618
+0 0.000596091 -6.26594e-005
+0 0.000599369 0
+0 0.000596091 6.26594e-005
+0 0.000586271 0.000124618
+0 0.000570044 0.000185229
+0 0.000547543 0.000243783
+0 0.000519082 0.000299692
+0 0.000484899 0.000352308
+0 0.000445426 0.000401065
+0 0.00040105 0.00044544
+0 0.000352308 0.000484906
+0 0.000299692 0.000519082
+0 0.000243783 0.000547573
+0 0.000185221 0.000570036
+0 0.000124618 0.000586286
+0 6.26445e-005 0.000596091
+0 0 0.000599384
+0 -6.26594e-005 0.000596091
+0 -0.000124618 0.000586286
+0 -0.000185221 0.000570036
+0 -0.000243783 0.000547573
+0 -0.000299692 0.000519082
+0 -0.000352308 0.000484906
+0 -0.000401065 0.00044544
+0 -0.000445426 0.000401065
+0 -0.000484914 0.000352308
+0 -0.000519082 0.000299692
+0 -0.000547558 0.000243783
+0 -0.000570044 0.000185229
+0 -0.000586286 0.000124618
+0 -0.000596091 6.26594e-005
+0 -0.000599384 0
+0 -0.000596091 -6.26594e-005
+0 -0.000586286 -0.000124618
+0 -0.000570044 -0.000185229
+0 -0.000547558 -0.000243783
+0 -0.000519082 -0.000299692
+0 -0.000484914 -0.000352308
+0 -0.000445426 -0.000401065
+0 -0.000401065 -0.000445441
+0 -0.000352308 -0.000484921
+0 -0.000299692 -0.000519082
+0 -0.000243783 -0.000547573
+0 -0.000185221 -0.000570037
+0 -0.000124618 -0.000586286
+0 -6.26594e-005 -0.000596091
+0 0 0
+numsurf 60
+SURF 0x30
+mat 1
+refs 3
+0 1 0.5
+1 0.997261 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+1 0.997261 0.552264
+2 0.989074 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+2 0.989074 0.603956
+3 0.975528 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+3 0.975528 0.654508
+4 0.956773 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+4 0.956773 0.703368
+5 0.933013 0.75
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+5 0.933013 0.75
+6 0.904508 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+6 0.904508 0.793893
+7 0.871572 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+7 0.871572 0.834565
+8 0.834565 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+8 0.834565 0.871572
+9 0.793893 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+9 0.793893 0.904508
+10 0.75 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+10 0.75 0.933013
+11 0.703368 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+11 0.703368 0.956773
+12 0.654508 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+12 0.654508 0.975528
+13 0.603956 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+13 0.603956 0.989074
+14 0.552264 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+14 0.552264 0.997261
+15 0.5 1
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+15 0.5 1
+16 0.447736 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+16 0.447736 0.997261
+17 0.396044 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+17 0.396044 0.989074
+18 0.345491 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+18 0.345491 0.975528
+19 0.296632 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+19 0.296632 0.956773
+20 0.25 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+20 0.25 0.933013
+21 0.206107 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+21 0.206107 0.904508
+22 0.165435 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+22 0.165435 0.871572
+23 0.128428 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+23 0.128428 0.834565
+24 0.0954915 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+24 0.0954915 0.793893
+25 0.0669873 0.75
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+25 0.0669873 0.75
+26 0.0432273 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+26 0.0432273 0.703368
+27 0.0244717 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+27 0.0244717 0.654508
+28 0.0109262 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+28 0.0109262 0.603956
+29 0.00273907 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+29 0.00273907 0.552264
+30 0 0.5
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+30 0 0.5
+31 0.00273907 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+31 0.00273907 0.447736
+32 0.0109262 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+32 0.0109262 0.396044
+33 0.0244718 0.345491
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+33 0.0244718 0.345491
+34 0.0432273 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+34 0.0432273 0.296632
+35 0.0669874 0.25
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+35 0.0669874 0.25
+36 0.0954915 0.206107
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+36 0.0954915 0.206107
+37 0.128428 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+37 0.128428 0.165435
+38 0.165435 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+38 0.165435 0.128428
+39 0.206107 0.0954914
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+39 0.206107 0.0954914
+40 0.25 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+40 0.25 0.0669873
+41 0.296632 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+41 0.296632 0.0432273
+42 0.345491 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+42 0.345491 0.0244718
+43 0.396044 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+43 0.396044 0.0109262
+44 0.447736 0.00273904
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+44 0.447736 0.00273904
+45 0.5 0
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+45 0.5 0
+46 0.552264 0.00273907
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+46 0.552264 0.00273907
+47 0.603956 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+47 0.603956 0.0109262
+48 0.654509 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+48 0.654509 0.0244718
+49 0.703368 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+49 0.703368 0.0432273
+50 0.75 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+50 0.75 0.0669873
+51 0.793893 0.0954916
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+51 0.793893 0.0954916
+52 0.834565 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+52 0.834565 0.128428
+53 0.871572 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+53 0.871572 0.165435
+54 0.904509 0.206108
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+54 0.904509 0.206108
+55 0.933013 0.25
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+55 0.933013 0.25
+56 0.956773 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+56 0.956773 0.296632
+57 0.975528 0.345492
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+57 0.975528 0.345492
+58 0.989074 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+58 0.989074 0.396044
+59 0.997261 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+59 0.997261 0.447736
+0 1 0.5
+60 0.5 0.5
+kids 0
+OBJECT poly
+name "n1pos2"
+loc 0.000409974 0.018883 0.00416738
+crease 45.000000
+numvert 61
+0 0 0
+0 -9.86606e-005 -0.000938662
+0 -0.000196248 -0.000923224
+0 -0.00029166 -0.000897639
+0 -0.000383899 -0.000862263
+0 -0.00047192 -0.000817389
+0 -0.00055477 -0.000763595
+0 -0.000631556 -0.000701435
+0 -0.000701398 -0.000631549
+0 -0.00076358 -0.00055477
+0 -0.000817388 -0.00047192
+0 -0.000862226 -0.000383884
+0 -0.000897646 -0.000291668
+0 -0.000923216 -0.000196233
+0 -0.000938669 -9.86606e-005
+0 -0.00094384 0
+0 -0.000938669 9.86606e-005
+0 -0.000923216 0.000196233
+0 -0.000897646 0.000291668
+0 -0.000862226 0.000383884
+0 -0.000817388 0.00047192
+0 -0.00076358 0.00055477
+0 -0.000701398 0.000631548
+0 -0.000631556 0.000701435
+0 -0.00055477 0.000763573
+0 -0.00047192 0.000817388
+0 -0.000383899 0.000862263
+0 -0.00029166 0.000897638
+0 -0.000196248 0.000923224
+0 -9.86606e-005 0.000938661
+0 0 0.00094384
+0 9.86606e-005 0.000938661
+0 0.000196233 0.000923224
+0 0.00029166 0.000897638
+0 0.000383899 0.000862263
+0 0.00047192 0.000817388
+0 0.00055477 0.000763573
+0 0.000631556 0.000701435
+0 0.000701398 0.000631548
+0 0.00076358 0.00055477
+0 0.000817388 0.00047192
+0 0.000862226 0.000383884
+0 0.000897646 0.000291668
+0 0.000923216 0.000196233
+0 0.000938654 9.86606e-005
+0 0.00094384 0
+0 0.000938654 -9.86606e-005
+0 0.000923216 -0.000196233
+0 0.000897646 -0.000291668
+0 0.000862226 -0.000383884
+0 0.000817388 -0.00047192
+0 0.00076358 -0.00055477
+0 0.000701398 -0.000631549
+0 0.000631556 -0.000701435
+0 0.00055477 -0.000763573
+0 0.00047192 -0.000817389
+0 0.000383899 -0.000862263
+0 0.00029166 -0.000897639
+0 0.000196233 -0.000923224
+0 9.86606e-005 -0.000938662
+0 0 -0.00094384
+numsurf 60
+SURF 0x30
+mat 2
+refs 3
+1 0.997261 0.447736
+60 1 0.5
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+2 0.989074 0.396044
+1 0.997261 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+3 0.975528 0.345492
+2 0.989074 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+4 0.956773 0.296632
+3 0.975528 0.345492
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+5 0.933013 0.25
+4 0.956773 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+6 0.904509 0.206108
+5 0.933013 0.25
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+7 0.871572 0.165435
+6 0.904509 0.206108
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+8 0.834565 0.128428
+7 0.871572 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+9 0.793893 0.0954916
+8 0.834565 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+10 0.75 0.0669873
+9 0.793893 0.0954916
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+11 0.703368 0.0432273
+10 0.75 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+12 0.654509 0.0244718
+11 0.703368 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+13 0.603956 0.0109262
+12 0.654509 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+14 0.552264 0.00273907
+13 0.603956 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+15 0.5 0
+14 0.552264 0.00273907
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+16 0.447736 0.00273904
+15 0.5 0
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+17 0.396044 0.0109262
+16 0.447736 0.00273904
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+18 0.345491 0.0244718
+17 0.396044 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+19 0.296632 0.0432273
+18 0.345491 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+20 0.25 0.0669873
+19 0.296632 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+21 0.206107 0.0954914
+20 0.25 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+22 0.165435 0.128428
+21 0.206107 0.0954914
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+23 0.128428 0.165435
+22 0.165435 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+24 0.0954915 0.206107
+23 0.128428 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+25 0.0669874 0.25
+24 0.0954915 0.206107
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+26 0.0432273 0.296632
+25 0.0669874 0.25
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+27 0.0244718 0.345491
+26 0.0432273 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+28 0.0109262 0.396044
+27 0.0244718 0.345491
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+29 0.00273907 0.447736
+28 0.0109262 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+30 0 0.5
+29 0.00273907 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+31 0.00273907 0.552264
+30 0 0.5
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+32 0.0109262 0.603956
+31 0.00273907 0.552264
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+33 0.0244717 0.654508
+32 0.0109262 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+34 0.0432273 0.703368
+33 0.0244717 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+35 0.0669873 0.75
+34 0.0432273 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+36 0.0954915 0.793893
+35 0.0669873 0.75
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+37 0.128428 0.834565
+36 0.0954915 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+38 0.165435 0.871572
+37 0.128428 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+39 0.206107 0.904508
+38 0.165435 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+40 0.25 0.933013
+39 0.206107 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+41 0.296632 0.956773
+40 0.25 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+42 0.345491 0.975528
+41 0.296632 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+43 0.396044 0.989074
+42 0.345491 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+44 0.447736 0.997261
+43 0.396044 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+45 0.5 1
+44 0.447736 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+46 0.552264 0.997261
+45 0.5 1
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+47 0.603956 0.989074
+46 0.552264 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+48 0.654508 0.975528
+47 0.603956 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+49 0.703368 0.956773
+48 0.654508 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+50 0.75 0.933013
+49 0.703368 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+51 0.793893 0.904508
+50 0.75 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+52 0.834565 0.871572
+51 0.793893 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+53 0.871572 0.834565
+52 0.834565 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+54 0.904508 0.793893
+53 0.871572 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+55 0.933013 0.75
+54 0.904508 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+56 0.956773 0.703368
+55 0.933013 0.75
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+57 0.975528 0.654508
+56 0.956773 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+58 0.989074 0.603956
+57 0.975528 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+59 0.997261 0.552264
+58 0.989074 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+60 1 0.5
+59 0.997261 0.552264
+0 0.5 0.5
+kids 0
+OBJECT poly
+name "n12"
+loc 0.000596688 0.00998296 0.00416768
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00938449 0.000477958
+0 -0.00858647 0.000477958
+0 -0.00858647 -0.000478942
+0 0.00938449 -0.000478942
+numsurf 1
+SURF 0x0
+mat 4
+refs 4
+3 1.00067 0.999407
+0 4.45843e-005 0.999407
+1 4.45843e-005 0.000756443
+2 1.00067 0.000756443
+kids 0
+OBJECT poly
+name "n1limy1"
+loc 0.00028362 0.0176809 0.0546341
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 -0.000980854 0.00380089
+0 -0.000956118 0.00466734
+0 0.00060828 0.00373316
+0 0.000633299 0.00459963
+numsurf 1
+SURF 0x20
+mat 3
+refs 4
+0 0 0
+2 0 0
+3 0 0
+1 0 0
+kids 0
+OBJECT poly
+name "n1pos1"
+loc 0.000314596 0.018883 0.0597828
+crease 45.000000
+numvert 61
+0 0 -0.000599384
+0 6.26445e-005 -0.000596091
+0 0.000124618 -0.000586286
+0 0.000185221 -0.000570036
+0 0.000243783 -0.000547573
+0 0.000299692 -0.000519082
+0 0.000352308 -0.000484906
+0 0.00040105 -0.00044544
+0 0.000445426 -0.000401065
+0 0.000484899 -0.000352308
+0 0.000519082 -0.000299692
+0 0.000547543 -0.000243783
+0 0.000570044 -0.000185229
+0 0.000586271 -0.000124618
+0 0.000596091 -6.26594e-005
+0 0.000599369 0
+0 0.000596091 6.26594e-005
+0 0.000586271 0.000124618
+0 0.000570044 0.000185229
+0 0.000547543 0.000243783
+0 0.000519082 0.000299692
+0 0.000484899 0.000352308
+0 0.000445426 0.000401065
+0 0.00040105 0.00044544
+0 0.000352308 0.000484906
+0 0.000299692 0.000519082
+0 0.000243783 0.000547573
+0 0.000185221 0.000570036
+0 0.000124618 0.000586286
+0 6.26445e-005 0.000596091
+0 0 0.000599384
+0 -6.26594e-005 0.000596091
+0 -0.000124618 0.000586286
+0 -0.000185221 0.000570036
+0 -0.000243783 0.000547573
+0 -0.000299692 0.000519082
+0 -0.000352308 0.000484906
+0 -0.000401065 0.00044544
+0 -0.000445426 0.000401065
+0 -0.000484914 0.000352308
+0 -0.000519082 0.000299692
+0 -0.000547558 0.000243783
+0 -0.000570044 0.000185229
+0 -0.000586286 0.000124618
+0 -0.000596091 6.26594e-005
+0 -0.000599384 0
+0 -0.000596091 -6.26594e-005
+0 -0.000586286 -0.000124618
+0 -0.000570044 -0.000185229
+0 -0.000547558 -0.000243783
+0 -0.000519082 -0.000299692
+0 -0.000484914 -0.000352308
+0 -0.000445426 -0.000401065
+0 -0.000401065 -0.00044544
+0 -0.000352308 -0.000484921
+0 -0.000299692 -0.000519082
+0 -0.000243783 -0.000547573
+0 -0.000185221 -0.000570036
+0 -0.000124618 -0.000586286
+0 -6.26594e-005 -0.000596091
+0 0 0
+numsurf 60
+SURF 0x30
+mat 1
+refs 3
+0 1 0.5
+1 0.997261 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+1 0.997261 0.552264
+2 0.989074 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+2 0.989074 0.603956
+3 0.975528 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+3 0.975528 0.654508
+4 0.956773 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+4 0.956773 0.703368
+5 0.933013 0.75
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+5 0.933013 0.75
+6 0.904508 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+6 0.904508 0.793893
+7 0.871572 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+7 0.871572 0.834565
+8 0.834565 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+8 0.834565 0.871572
+9 0.793893 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+9 0.793893 0.904508
+10 0.75 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+10 0.75 0.933013
+11 0.703368 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+11 0.703368 0.956773
+12 0.654508 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+12 0.654508 0.975528
+13 0.603956 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+13 0.603956 0.989074
+14 0.552264 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+14 0.552264 0.997261
+15 0.5 1
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+15 0.5 1
+16 0.447736 0.997261
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+16 0.447736 0.997261
+17 0.396044 0.989074
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+17 0.396044 0.989074
+18 0.345491 0.975528
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+18 0.345491 0.975528
+19 0.296632 0.956773
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+19 0.296632 0.956773
+20 0.25 0.933013
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+20 0.25 0.933013
+21 0.206107 0.904508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+21 0.206107 0.904508
+22 0.165435 0.871572
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+22 0.165435 0.871572
+23 0.128428 0.834565
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+23 0.128428 0.834565
+24 0.0954915 0.793893
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+24 0.0954915 0.793893
+25 0.0669873 0.75
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+25 0.0669873 0.75
+26 0.0432273 0.703368
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+26 0.0432273 0.703368
+27 0.0244717 0.654508
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+27 0.0244717 0.654508
+28 0.0109262 0.603956
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+28 0.0109262 0.603956
+29 0.00273907 0.552264
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+29 0.00273907 0.552264
+30 0 0.5
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+30 0 0.5
+31 0.00273907 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+31 0.00273907 0.447736
+32 0.0109262 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+32 0.0109262 0.396044
+33 0.0244718 0.345491
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+33 0.0244718 0.345491
+34 0.0432273 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+34 0.0432273 0.296632
+35 0.0669874 0.25
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+35 0.0669874 0.25
+36 0.0954915 0.206107
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+36 0.0954915 0.206107
+37 0.128428 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+37 0.128428 0.165435
+38 0.165435 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+38 0.165435 0.128428
+39 0.206107 0.0954914
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+39 0.206107 0.0954914
+40 0.25 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+40 0.25 0.0669873
+41 0.296632 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+41 0.296632 0.0432273
+42 0.345491 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+42 0.345491 0.0244718
+43 0.396044 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+43 0.396044 0.0109262
+44 0.447736 0.00273904
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+44 0.447736 0.00273904
+45 0.5 0
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+45 0.5 0
+46 0.552264 0.00273907
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+46 0.552264 0.00273907
+47 0.603956 0.0109262
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+47 0.603956 0.0109262
+48 0.654509 0.0244718
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+48 0.654509 0.0244718
+49 0.703368 0.0432273
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+49 0.703368 0.0432273
+50 0.75 0.0669873
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+50 0.75 0.0669873
+51 0.793893 0.0954916
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+51 0.793893 0.0954916
+52 0.834565 0.128428
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+52 0.834565 0.128428
+53 0.871572 0.165435
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+53 0.871572 0.165435
+54 0.904509 0.206108
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+54 0.904509 0.206108
+55 0.933013 0.25
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+55 0.933013 0.25
+56 0.956773 0.296632
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+56 0.956773 0.296632
+57 0.975528 0.345492
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+57 0.975528 0.345492
+58 0.989074 0.396044
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+58 0.989074 0.396044
+59 0.997261 0.447736
+60 0.5 0.5
+SURF 0x30
+mat 1
+refs 3
+59 0.997261 0.447736
+0 1 0.5
+60 0.5 0.5
+kids 0
+OBJECT poly
+name "n1pos1"
+loc 0.000305618 0.018883 0.0597828
+crease 45.000000
+numvert 61
+0 0 0
+0 -9.86606e-005 -0.000938661
+0 -0.000196248 -0.000923224
+0 -0.00029166 -0.000897638
+0 -0.000383899 -0.000862263
+0 -0.00047192 -0.000817388
+0 -0.00055477 -0.000763595
+0 -0.000631556 -0.000701435
+0 -0.000701398 -0.000631548
+0 -0.00076358 -0.00055477
+0 -0.000817388 -0.00047192
+0 -0.000862226 -0.000383884
+0 -0.000897646 -0.000291668
+0 -0.000923216 -0.000196233
+0 -0.000938669 -9.86606e-005
+0 -0.00094384 0
+0 -0.000938669 9.86606e-005
+0 -0.000923216 0.000196233
+0 -0.000897646 0.000291668
+0 -0.000862226 0.000383884
+0 -0.000817388 0.00047192
+0 -0.00076358 0.00055477
+0 -0.000701398 0.000631548
+0 -0.000631556 0.000701435
+0 -0.00055477 0.000763573
+0 -0.00047192 0.000817388
+0 -0.000383899 0.000862263
+0 -0.00029166 0.000897638
+0 -0.000196248 0.000923224
+0 -9.86606e-005 0.000938661
+0 0 0.00094384
+0 9.86606e-005 0.000938661
+0 0.000196233 0.000923224
+0 0.00029166 0.000897638
+0 0.000383899 0.000862263
+0 0.00047192 0.000817388
+0 0.00055477 0.000763573
+0 0.000631556 0.000701435
+0 0.000701398 0.000631548
+0 0.00076358 0.00055477
+0 0.000817388 0.00047192
+0 0.000862226 0.000383884
+0 0.000897646 0.000291668
+0 0.000923216 0.000196233
+0 0.000938654 9.86606e-005
+0 0.00094384 0
+0 0.000938654 -9.86606e-005
+0 0.000923216 -0.000196233
+0 0.000897646 -0.000291668
+0 0.000862226 -0.000383884
+0 0.000817388 -0.00047192
+0 0.00076358 -0.00055477
+0 0.000701398 -0.000631548
+0 0.000631556 -0.000701435
+0 0.00055477 -0.000763573
+0 0.00047192 -0.000817388
+0 0.000383899 -0.000862263
+0 0.00029166 -0.000897638
+0 0.000196233 -0.000923224
+0 9.86606e-005 -0.000938661
+0 0 -0.00094384
+numsurf 60
+SURF 0x30
+mat 2
+refs 3
+1 0.997261 0.447736
+60 1 0.5
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+2 0.989074 0.396044
+1 0.997261 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+3 0.975528 0.345492
+2 0.989074 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+4 0.956773 0.296632
+3 0.975528 0.345492
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+5 0.933013 0.25
+4 0.956773 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+6 0.904509 0.206108
+5 0.933013 0.25
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+7 0.871572 0.165435
+6 0.904509 0.206108
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+8 0.834565 0.128428
+7 0.871572 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+9 0.793893 0.0954916
+8 0.834565 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+10 0.75 0.0669873
+9 0.793893 0.0954916
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+11 0.703368 0.0432273
+10 0.75 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+12 0.654509 0.0244718
+11 0.703368 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+13 0.603956 0.0109262
+12 0.654509 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+14 0.552264 0.00273907
+13 0.603956 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+15 0.5 0
+14 0.552264 0.00273907
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+16 0.447736 0.00273904
+15 0.5 0
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+17 0.396044 0.0109262
+16 0.447736 0.00273904
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+18 0.345491 0.0244718
+17 0.396044 0.0109262
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+19 0.296632 0.0432273
+18 0.345491 0.0244718
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+20 0.25 0.0669873
+19 0.296632 0.0432273
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+21 0.206107 0.0954914
+20 0.25 0.0669873
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+22 0.165435 0.128428
+21 0.206107 0.0954914
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+23 0.128428 0.165435
+22 0.165435 0.128428
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+24 0.0954915 0.206107
+23 0.128428 0.165435
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+25 0.0669874 0.25
+24 0.0954915 0.206107
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+26 0.0432273 0.296632
+25 0.0669874 0.25
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+27 0.0244718 0.345491
+26 0.0432273 0.296632
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+28 0.0109262 0.396044
+27 0.0244718 0.345491
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+29 0.00273907 0.447736
+28 0.0109262 0.396044
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+30 0 0.5
+29 0.00273907 0.447736
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+31 0.00273907 0.552264
+30 0 0.5
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+32 0.0109262 0.603956
+31 0.00273907 0.552264
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+33 0.0244717 0.654508
+32 0.0109262 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+34 0.0432273 0.703368
+33 0.0244717 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+35 0.0669873 0.75
+34 0.0432273 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+36 0.0954915 0.793893
+35 0.0669873 0.75
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+37 0.128428 0.834565
+36 0.0954915 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+38 0.165435 0.871572
+37 0.128428 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+39 0.206107 0.904508
+38 0.165435 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+40 0.25 0.933013
+39 0.206107 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+41 0.296632 0.956773
+40 0.25 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+42 0.345491 0.975528
+41 0.296632 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+43 0.396044 0.989074
+42 0.345491 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+44 0.447736 0.997261
+43 0.396044 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+45 0.5 1
+44 0.447736 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+46 0.552264 0.997261
+45 0.5 1
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+47 0.603956 0.989074
+46 0.552264 0.997261
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+48 0.654508 0.975528
+47 0.603956 0.989074
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+49 0.703368 0.956773
+48 0.654508 0.975528
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+50 0.75 0.933013
+49 0.703368 0.956773
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+51 0.793893 0.904508
+50 0.75 0.933013
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+52 0.834565 0.871572
+51 0.793893 0.904508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+53 0.871572 0.834565
+52 0.834565 0.871572
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+54 0.904508 0.793893
+53 0.871572 0.834565
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+55 0.933013 0.75
+54 0.904508 0.793893
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+56 0.956773 0.703368
+55 0.933013 0.75
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+57 0.975528 0.654508
+56 0.956773 0.703368
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+58 0.989074 0.603956
+57 0.975528 0.654508
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+59 0.997261 0.552264
+58 0.989074 0.603956
+0 0.5 0.5
+SURF 0x30
+mat 2
+refs 3
+60 1 0.5
+59 0.997261 0.552264
+0 0.5 0.5
+kids 0
 OBJECT poly
 name "egt2"
 loc 0.000492332 0.039771 0.00416768
@@ -49,38 +1820,17 @@ refs 4
 1 1.00067 0.000756443
 kids 0
 OBJECT poly
-name "n12"
-loc 0.000492332 0.00995733 0.00416768
-data 10
-enginepane
-texture "needle.png"
-crease 30.000002
-numvert 4
-0 0.00935113 -0.000478942
-0 -0.00856084 -0.000478942
-0 -0.00856084 0.000477958
-0 0.00935113 0.000477958
-numsurf 1
-SURF 0x0
-mat 4
-refs 4
-0 1.00067 0.999407
-3 4.45843e-005 0.999407
-2 4.45843e-005 0.000756443
-1 1.00067 0.000756443
-kids 0
-OBJECT poly
 name "n11"
-loc 0.000492332 0.00995733 0.0597831
+loc 0.000492332 0.00998296 0.0597831
 data 10
 enginepane
 texture "needle.png"
 crease 30.000002
 numvert 4
-0 0.00935113 0.000477958
-0 -0.00856084 0.000477958
-0 -0.00856084 -0.000478942
-0 0.00935113 -0.000478942
+0 0.00938449 0.000477958
+0 -0.00858647 0.000477958
+0 -0.00858647 -0.000478942
+0 0.00938449 -0.000478942
 numsurf 1
 SURF 0x0
 mat 4
@@ -1902,124 +3652,7 @@ refs 4
 0 0.742187 0.324581
 kids 0
 OBJECT poly
-name "XX2"
-loc 1.91422e-005 -0.0851298 -0.51126
-texture "eicasIAE-extra.png"
-crease 45.000000
-numvert 10
-0 0.106466 0.533966
-0 0.106466 0.533514
-0 0.106466 0.497174
-0 0.106899 0.533966
-0 0.164009 0.533966
-0 0.158958 0.533966
-0 0.162229 0.533966
-0 0.158964 0.497174
-0 0.161028 0.497174
-0 0.164015 0.497174
-numsurf 4
-SURF 0x10
-mat 0
-refs 4
-9 0.585815 0.994918
-4 0.361673 0.994882
-6 0.361673 0.983774
-8 0.585815 0.976283
-SURF 0x10
-mat 0
-refs 4
-8 0.585815 0.976283
-6 0.361673 0.983774
-5 0.361673 0.963371
-7 0.585815 0.963407
-SURF 0x10
-mat 0
-refs 5
-2 0.585815 0.635912
-7 0.585815 0.963407
-5 0.361673 0.963371
-3 0.361673 0.638612
-1 0.364424 0.635911
-SURF 0x10
-mat 0
-refs 3
-1 0.364424 0.635911
-3 0.361673 0.638612
-0 0.361673 0.635911
-kids 0
-OBJECT poly
-name "XX1"
-loc 1.91422e-005 -0.0851298 -0.51126
-texture "eicasIAE-extra.png"
-crease 45.000000
-numvert 12
-0 0.106466 0.553931
-0 0.106466 0.588269
-0 0.106466 0.593319
-0 0.106466 0.590063
-0 0.164001 0.58826
-0 0.16252 0.591832
-0 0.15895 0.58826
-0 0.15895 0.593311
-0 0.126039 0.553931
-0 0.158955 0.553931
-0 0.162881 0.553931
-0 0.164006 0.553931
-numsurf 8
-SURF 0x10
-mat 0
-refs 3
-11 0.240046 0.994862
-4 0.0309113 0.994828
-10 0.240046 0.987839
-SURF 0x10
-mat 0
-refs 4
-10 0.240046 0.987839
-4 0.0309113 0.994828
-6 0.0309113 0.963318
-9 0.240046 0.963352
-SURF 0x10
-mat 0
-refs 3
-9 0.240046 0.963352
-6 0.0309113 0.963318
-8 0.240046 0.758012
-SURF 0x10
-mat 0
-refs 3
-4 0.0309113 0.994828
-5 0.00915051 0.985588
-6 0.0309113 0.963318
-SURF 0x10
-mat 0
-refs 3
-7 0.00014019 0.963318
-6 0.0309113 0.963318
-5 0.00915051 0.985588
-SURF 0x10
-mat 0
-refs 4
-3 0.0199245 0.635911
-6 0.0309113 0.963318
-7 0.00014019 0.963318
-2 9.03623e-005 0.635911
-SURF 0x10
-mat 0
-refs 3
-1 0.0308593 0.635911
-6 0.0309113 0.963318
-3 0.0199245 0.635911
-SURF 0x10
-mat 0
-refs 4
-0 0.240046 0.635911
-8 0.240046 0.758012
-6 0.0309113 0.963318
-1 0.0308593 0.635911
-kids 0
-OBJECT poly
-name "XX4"
+name "XXn12"
 loc 1.91422e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
@@ -2047,7 +3680,7 @@ refs 4
 1 0.545664 0.45799
 kids 0
 OBJECT poly
-name "XX3"
+name "XXn11"
 loc 1.91422e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
@@ -2261,3 +3894,185 @@ refs 4
 9 0.969186 0.653651
 1 0.969142 0.379501
 kids 0
+OBJECT poly
+name "XXepr1"
+loc 1.91422e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 12
+0 0.136407 0.593314
+0 0.136407 0.553931
+0 0.136407 0.589034
+0 0.136407 0.564746
+0 0.136407 0.588264
+0 0.164006 0.553931
+0 0.162881 0.553931
+0 0.158955 0.553931
+0 0.15895 0.593311
+0 0.15895 0.58826
+0 0.16252 0.591832
+0 0.164001 0.58826
+numsurf 8
+SURF 0x10
+mat 0
+refs 3
+8 0.00014019 0.963318
+9 0.0309113 0.963318
+10 0.00915051 0.985588
+SURF 0x10
+mat 0
+refs 3
+11 0.0309113 0.994828
+10 0.00915051 0.985588
+9 0.0309113 0.963318
+SURF 0x10
+mat 0
+refs 4
+6 0.240046 0.987839
+11 0.0309113 0.994828
+9 0.0309113 0.963318
+7 0.240046 0.963352
+SURF 0x10
+mat 0
+refs 3
+5 0.240046 0.994862
+11 0.0309113 0.994828
+6 0.240046 0.987839
+SURF 0x10
+mat 0
+refs 3
+4 0.030889 0.82269
+9 0.0309113 0.963318
+2 0.0261922 0.82269
+SURF 0x10
+mat 0
+refs 3
+3 0.174162 0.82269
+9 0.0309113 0.963318
+4 0.030889 0.82269
+SURF 0x10
+mat 0
+refs 4
+1 0.240046 0.822691
+7 0.240046 0.963352
+9 0.0309113 0.963318
+3 0.174162 0.82269
+SURF 0x10
+mat 0
+refs 4
+2 0.0261922 0.82269
+9 0.0309113 0.963318
+8 0.00014019 0.963318
+0 0.000118788 0.82269
+kids 0
+OBJECT poly
+name "XXegt1"
+loc 1.91422e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 10
+0 0.106466 0.553931
+0 0.106466 0.588269
+0 0.106466 0.593319
+0 0.106466 0.590063
+0 0.126039 0.553931
+0 0.136407 0.588264
+0 0.136407 0.564746
+0 0.136407 0.589034
+0 0.136407 0.553931
+0 0.136407 0.593314
+numsurf 4
+SURF 0x10
+mat 0
+refs 4
+9 0.000118788 0.82269
+2 9.03623e-005 0.635911
+3 0.0199245 0.635911
+7 0.0261922 0.82269
+SURF 0x10
+mat 0
+refs 3
+6 0.174162 0.82269
+4 0.240046 0.758012
+8 0.240046 0.822691
+SURF 0x10
+mat 0
+refs 5
+5 0.030889 0.82269
+1 0.0308593 0.635911
+0 0.240046 0.635911
+4 0.240046 0.758012
+6 0.174162 0.82269
+SURF 0x10
+mat 0
+refs 4
+7 0.0261922 0.82269
+3 0.0199245 0.635911
+1 0.0308593 0.635911
+5 0.030889 0.82269
+kids 0
+OBJECT poly
+name "XXepr2"
+loc 1.91422e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 8
+0 0.136407 0.533966
+0 0.136407 0.497174
+0 0.164015 0.497174
+0 0.161028 0.497174
+0 0.158964 0.497174
+0 0.162229 0.533966
+0 0.158958 0.533966
+0 0.164009 0.533966
+numsurf 3
+SURF 0x10
+mat 0
+refs 4
+3 0.585815 0.976283
+5 0.361673 0.983774
+6 0.361673 0.963371
+4 0.585815 0.963407
+SURF 0x10
+mat 0
+refs 4
+2 0.585815 0.994918
+7 0.361673 0.994882
+5 0.361673 0.983774
+3 0.585815 0.976283
+SURF 0x10
+mat 0
+refs 4
+1 0.585815 0.822691
+4 0.585815 0.963407
+6 0.361673 0.963371
+0 0.361673 0.822692
+kids 0
+OBJECT poly
+name "XXegt2"
+loc 1.91422e-005 -0.0851298 -0.51126
+texture "eicasIAE-extra.png"
+crease 45.000000
+numvert 6
+0 0.106466 0.533966
+0 0.106466 0.533514
+0 0.106466 0.497174
+0 0.106899 0.533966
+0 0.136407 0.497174
+0 0.136407 0.533966
+numsurf 2
+SURF 0x10
+mat 0
+refs 5
+5 0.361673 0.822692
+3 0.361673 0.638612
+1 0.364424 0.635911
+2 0.585815 0.635912
+4 0.585815 0.822691
+SURF 0x10
+mat 0
+refs 3
+1 0.364424 0.635911
+3 0.361673 0.638612
+0 0.361673 0.635911
+kids 0
diff --git a/Nasal/fadec-cfm.nas b/Nasal/fadec-cfm.nas
new file mode 100644
index 00000000..15bb1371
--- /dev/null
+++ b/Nasal/fadec-cfm.nas
@@ -0,0 +1,90 @@
+# A3XX CFM FADEC by Joshua Davidson (it0uchpods)
+
+setlistener("/sim/signals/fdm-initialized", func {
+	setprop("/systems/fadec/n1mode1", 0); # Doesn't do anything, just here for other logic #
+	setprop("/systems/fadec/n1mode2", 0); # Doesn't do anything, just here for other logic #
+	setprop("/systems/fadec/eng1/egt", 1);
+	setprop("/systems/fadec/eng1/n1", 1);
+	setprop("/systems/fadec/eng1/n2", 1);
+	setprop("/systems/fadec/eng1/ff", 1);
+	setprop("/systems/fadec/eng2/egt", 1);
+	setprop("/systems/fadec/eng2/n1", 1);
+	setprop("/systems/fadec/eng2/n2", 1);
+	setprop("/systems/fadec/eng2/ff", 1);
+	setprop("/systems/fadec/power-avail", 0);
+	setprop("/systems/fadec/powered1", 0);
+	setprop("/systems/fadec/powered2", 0);
+	fadecLoop.start();
+});
+
+var fadecLoop = maketimer(0.7, func {
+	var ac1 = getprop("/systems/electrical/bus/ac1");
+	var ac2 = getprop("/systems/electrical/bus/ac1");
+	var acess = getprop("/systems/electrical/bus/ac-ess");
+	var state1 = getprop("/engines/engine[0]/state");
+	var state2 = getprop("/engines/engine[1]/state");
+	var master1 = getprop("/controls/engines/engine[0]/cutoff-switch");
+	var master2 = getprop("/controls/engines/engine[1]/cutoff-switch");
+	var modeSel = getprop("/controls/engines/engine-start-switch");
+	
+	if (ac1 >= 110 or ac2 >= 110 or acess >= 110) {
+		setprop("/systems/fadec/power-avail", 1);
+	} else {
+		setprop("/systems/fadec/power-avail", 0);
+	}
+	
+	var powerAvail = getprop("/systems/fadec/power-avail");
+	
+	if (state1 == 3) {
+		setprop("/systems/fadec/powered1", 1);
+	} else if (powerAvail and modeSel == 2) {
+		setprop("/systems/fadec/powered1", 1);
+	} else {
+		setprop("/systems/fadec/powered1", 0);
+	}
+	
+	if (state2 == 3) {
+		setprop("/systems/fadec/powered2", 1);
+	} else if (powerAvail and modeSel == 2) {
+		setprop("/systems/fadec/powered2", 1);
+	} else {
+		setprop("/systems/fadec/powered2", 0);
+	}
+	
+	var powered1 = getprop("/systems/fadec/powered1");
+	var powered2 = getprop("/systems/fadec/powered2");
+	var N21 = getprop("/engines/engine[0]/n2");
+	var N22 = getprop("/engines/engine[1]/n2");
+	
+	if (powered1) {
+		setprop("/systems/fadec/eng1/n1", 1);
+		setprop("/systems/fadec/eng1/egt", 1);
+		setprop("/systems/fadec/eng1/ff", 1);
+	} else {
+		setprop("/systems/fadec/eng1/n1", 0);
+		setprop("/systems/fadec/eng1/egt", 0);
+		setprop("/systems/fadec/eng1/ff", 0);
+	}
+	
+	if (powered2) {
+		setprop("/systems/fadec/eng2/n1", 1);
+		setprop("/systems/fadec/eng2/egt", 1);
+		setprop("/systems/fadec/eng2/ff", 1);
+	} else {
+		setprop("/systems/fadec/eng2/n1", 0);
+		setprop("/systems/fadec/eng2/egt", 0);
+		setprop("/systems/fadec/eng2/ff", 0);
+	}
+	
+	if (powered1 and N21 >= 3.5) {
+		setprop("/systems/fadec/eng1/n2", 1);
+	} else {
+		setprop("/systems/fadec/eng1/n2", 0);
+	}
+	
+	if (powered2 and N22 >= 3.5) {
+		setprop("/systems/fadec/eng2/n2", 1);
+	} else {
+		setprop("/systems/fadec/eng2/n2", 0);
+	}
+});
diff --git a/Nasal/fadec.nas b/Nasal/fadec-common.nas
similarity index 98%
rename from Nasal/fadec.nas
rename to Nasal/fadec-common.nas
index 879af45b..80580fd4 100644
--- a/Nasal/fadec.nas
+++ b/Nasal/fadec-common.nas
@@ -8,6 +8,7 @@ setprop("/systems/thrust/epr/toga-lim", 0.0);
 setprop("/systems/thrust/epr/mct-lim", 0.0);
 setprop("/systems/thrust/epr/flx-lim", 0.0);
 setprop("/systems/thrust/epr/clb-lim", 0.0);
+setprop("/systems/thrust/n1/toga-lim", 95.9);
 setprop("/systems/thrust/n1/flx-lim", 0.0);
 setprop("/engines/flx-thr", 0.0);
 
@@ -191,7 +192,7 @@ var thrust_lim = func {
 			setprop("/controls/engines/epr-limit", eprclb);
 			setprop("/controls/engines/n1-limit", 89.2);
 		}
-	} else if (getprop("/FMGC/internal/flex-set") == 1) {
+	} else if (getprop("/FMGC/internal/flex-set") == 1 and getprop("/systems/fadec/n1mode1") == 0 and getprop("/systems/fadec/n1mode2") == 0) {
 		setprop("/systems/thrust/lim-flex", 1);
 		setprop("/controls/engines/thrust-limit", "FLX");
 		setprop("/controls/engines/epr-limit", eprflx);
diff --git a/Nasal/fadec-iae.nas b/Nasal/fadec-iae.nas
new file mode 100644
index 00000000..82a36e6a
--- /dev/null
+++ b/Nasal/fadec-iae.nas
@@ -0,0 +1,132 @@
+# A3XX IAE FADEC by Joshua Davidson (it0uchpods)
+
+setlistener("/sim/signals/fdm-initialized", func {
+	setprop("/controls/fadec/n1mode1", 0);
+	setprop("/controls/fadec/n1mode2", 0);
+	setprop("/systems/fadec/n1mode1", 0); # 0 == EPR, 1 == N1 Rated, 2 == N1 Unrated #
+	setprop("/systems/fadec/n1mode2", 0); # 0 == EPR, 1 == N1 Rated, 2 == N1 Unrated #
+	setprop("/systems/fadec/eng1/epr", 1);
+	setprop("/systems/fadec/eng1/egt", 1);
+	setprop("/systems/fadec/eng1/n1", 1);
+	setprop("/systems/fadec/eng1/n2", 1);
+	setprop("/systems/fadec/eng1/ff", 1);
+	setprop("/systems/fadec/eng2/epr", 1);
+	setprop("/systems/fadec/eng2/egt", 1);
+	setprop("/systems/fadec/eng2/n1", 1);
+	setprop("/systems/fadec/eng2/n2", 1);
+	setprop("/systems/fadec/eng2/ff", 1);
+	setprop("/systems/fadec/power-avail", 0);
+	setprop("/systems/fadec/powered1", 0);
+	setprop("/systems/fadec/powered2", 0);
+	fadecLoop.start();
+});
+
+var fadecLoop = maketimer(0.7, func {
+	var ac1 = getprop("/systems/electrical/bus/ac1");
+	var ac2 = getprop("/systems/electrical/bus/ac1");
+	var acess = getprop("/systems/electrical/bus/ac-ess");
+	var state1 = getprop("/engines/engine[0]/state");
+	var state2 = getprop("/engines/engine[1]/state");
+	var master1 = getprop("/controls/engines/engine[0]/cutoff-switch");
+	var master2 = getprop("/controls/engines/engine[1]/cutoff-switch");
+	var modeSel = getprop("/controls/engines/engine-start-switch");
+	var N1Mode1_sw = getprop("/controls/fadec/n1mode1");
+	var N1Mode2_sw = getprop("/controls/fadec/n1mode2");
+	
+	if (ac1 >= 110 or ac2 >= 110 or acess >= 110) {
+		setprop("/systems/fadec/power-avail", 1);
+	} else {
+		setprop("/systems/fadec/power-avail", 0);
+	}
+	
+	var powerAvail = getprop("/systems/fadec/power-avail");
+	
+	if (state1 == 3) {
+		setprop("/systems/fadec/powered1", 1);
+	} else if (powerAvail and modeSel == 2) {
+		setprop("/systems/fadec/powered1", 1);
+	} else {
+		setprop("/systems/fadec/powered1", 0);
+	}
+	
+	if (state2 == 3) {
+		setprop("/systems/fadec/powered2", 1);
+	} else if (powerAvail and modeSel == 2) {
+		setprop("/systems/fadec/powered2", 1);
+	} else {
+		setprop("/systems/fadec/powered2", 0);
+	}
+	
+	var powered1 = getprop("/systems/fadec/powered1");
+	var powered2 = getprop("/systems/fadec/powered2");
+	var N1Mode1 = getprop("/systems/fadec/n1mode1");
+	var N1Mode2 = getprop("/systems/fadec/n1mode2");
+	var N11 = getprop("/engines/engine[0]/n1");
+	var N12 = getprop("/engines/engine[1]/n1");
+	var N21 = getprop("/engines/engine[0]/n2");
+	var N22 = getprop("/engines/engine[1]/n2");
+	
+	if (powered1 and N1Mode1 == 0) {
+		setprop("/systems/fadec/eng1/epr", 1);
+	} else {
+		setprop("/systems/fadec/eng1/epr", 0);
+	}
+	
+	if (powered2 and N1Mode2 == 0) {
+		setprop("/systems/fadec/eng2/epr", 1);
+	} else {
+		setprop("/systems/fadec/eng2/epr", 0);
+	}
+	
+	if (powered1) {
+		setprop("/systems/fadec/eng1/egt", 1);
+		setprop("/systems/fadec/eng1/ff", 1);
+	} else {
+		setprop("/systems/fadec/eng1/egt", 0);
+		setprop("/systems/fadec/eng1/ff", 0);
+	}
+	
+	if (powered2) {
+		setprop("/systems/fadec/eng2/egt", 1);
+		setprop("/systems/fadec/eng2/ff", 1);
+	} else {
+		setprop("/systems/fadec/eng2/egt", 0);
+		setprop("/systems/fadec/eng2/ff", 0);
+	}
+	
+	if (powered1 and N11 >= 3.5) {
+		setprop("/systems/fadec/eng1/n1", 1);
+	} else {
+		setprop("/systems/fadec/eng1/n1", 0);
+	}
+	
+	if (powered2 and N12 >= 3.5) {
+		setprop("/systems/fadec/eng2/n1", 1);
+	} else {
+		setprop("/systems/fadec/eng2/n1", 0);
+	}
+	
+	if (powered1 and N21 >= 3.5) {
+		setprop("/systems/fadec/eng1/n2", 1);
+	} else {
+		setprop("/systems/fadec/eng1/n2", 0);
+	}
+	
+	if (powered2 and N22 >= 3.5) {
+		setprop("/systems/fadec/eng2/n2", 1);
+	} else {
+		setprop("/systems/fadec/eng2/n2", 0);
+	}
+	
+	if (N1Mode1_sw == 1) {
+		setprop("/systems/fadec/n1mode1", 1);
+	} else {
+		setprop("/systems/fadec/n1mode1", 0);
+	}
+	
+	if (N1Mode2_sw == 1) {
+		setprop("/systems/fadec/n1mode2", 1);
+	} else {
+		setprop("/systems/fadec/n1mode2", 0);
+	}
+});
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 4f6d8b5a..6f04e105 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -227,6 +227,8 @@ var librariesLoop = maketimer(0.1, func {
 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);
 }
 
 var aglgears = func {
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index a4b02ba7..62d756d2 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -366,6 +366,40 @@
 		<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>
+            <expression>
+                <table>
+                    <property>/controls/engines/engine[0]/throttle-man</property>
+                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
+                    <entry><ind>1.00</ind><dep>105.8</dep></entry>
+                </table>
+            </expression>
+        </input>
+		<output>/engines/engine[0]/n1-cmd</output>
+    </filter>
+	
+    <filter>
+        <name>N1 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-man</property>
+                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
+                    <entry><ind>1.00</ind><dep>105.8</dep></entry>
+                </table>
+            </expression>
+        </input>
+		<output>/engines/engine[1]/n1-cmd</output>
+    </filter>
+	
 	<filter>
 		<name>Throttle 1</name>
 		<debug>false</debug>