diff --git a/A318-100-CFM-set.xml b/A318-100-CFM-set.xml
index dfa0d9ab..1e14f2eb 100644
--- a/A318-100-CFM-set.xml
+++ b/A318-100-CFM-set.xml
@@ -18,18 +18,18 @@
 			</livery>
 		</model>
 		
-		<!--previews>
+		<previews>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a318-1.png</path>
+				<path>Splash/A318/a318-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a318-2.png</path>
+				<path>Splash/A318/a318-2.png</path>
 			</preview>
-		</previews-->
+		</previews>
 
 		<view>
 			<name>Pilot View</name>
diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml
index 45f5ac84..4c80c637 100644
--- a/A318-100-CFM.xml
+++ b/A318-100-CFM.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml
index 433dcd98..da1f8fea 100644
--- a/A319-100-CFM-set.xml
+++ b/A319-100-CFM-set.xml
@@ -18,23 +18,23 @@
 			</livery>
 		</model>
 		
-		<!--previews>
+		<previews>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a319-1.png</path>
+				<path>Splash/A319/a319-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a319-2.png</path>
+				<path>Splash/A319/a319-2.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a319-3.png</path>
+				<path>Splash/A319/a319-3.png</path>
 			</preview>
-		</previews!-->
+		</previews>
 
 		<view>
 			<name>Pilot View</name>
diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml
index 1ff000c4..c42eeda5 100644
--- a/A319-100-CFM.xml
+++ b/A319-100-CFM.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml
index 6fc9538d..2e63d94b 100644
--- a/A319-100-IAE-set.xml
+++ b/A319-100-IAE-set.xml
@@ -18,23 +18,23 @@
 			</livery>
 		</model>
 		
-		<!--previews>
+		<previews>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a319-1.png</path>
+				<path>Splash/A319/a319-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a319-2.png</path>
+				<path>Splash/A319/a319-2.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a319-3.png</path>
+				<path>Splash/A319/a319-3.png</path>
 			</preview>
-		</previews!-->
+		</previews>
 		
 		<view>
 			<name>Pilot View</name>
diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index 8a97db6f..00aadc6e 100644
--- a/A319-100-IAE.xml
+++ b/A319-100-IAE.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
index ac82a4f9..82e72017 100644
--- a/A320-100-CFM-set.xml
+++ b/A320-100-CFM-set.xml
@@ -22,7 +22,37 @@
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-100.png</path>
+				<path>Splash/A320/a320-1.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-2.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-3.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-4.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-5.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-6.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-7.png</path>
 			</preview>
 		</previews>
 
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index aee2db7c..94396426 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 8f71a083..91aa9f0f 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -22,17 +22,37 @@
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-1.png</path>
+				<path>Splash/A320/a320-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-2.png</path>
+				<path>Splash/A320/a320-2.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-3.png</path>
+				<path>Splash/A320/a320-3.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-4.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-5.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-6.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-7.png</path>
 			</preview>
 		</previews>
 
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index 94ee9405..94ae417e 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -4,571 +4,604 @@
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
-<fileheader>
-	<author>Joshua Davidson (it0uchpods)</author>
-	<version>Pre V1.0</version>
-	<description>A3XX FDE</description>
-</fileheader>
+    <fileheader>
+        <author>Joshua Davidson (it0uchpods)</author>
+        <version>Pre V1.0</version>
+        <description>A3XX FDE</description>
+    </fileheader>
 
-<metrics>
-	<wingarea  unit="FT2"> 1319.79 </wingarea>
-	<wingspan  unit="FT" >  111.26 </wingspan>
-	<wing_incidence>          1.03 </wing_incidence>
-	<chord     unit="FT" >   13.76 </chord>
-	<htailarea unit="FT2">  334.24 </htailarea>
-	<htailarm  unit="FT" >   57.88 </htailarm>
-	<vtailarea unit="FT2">  248.79 </vtailarea>
-	<vtailarm  unit="FT" >   57.33 </vtailarm>
+    <metrics>
+        <wingarea  unit="FT2"> 1319.79 </wingarea>
+        <wingspan  unit="FT" >  111.26 </wingspan>
+        <wing_incidence>          1.03 </wing_incidence>
+        <chord     unit="FT" >   13.76 </chord>
+        <htailarea unit="FT2">  334.24 </htailarea>
+        <htailarm  unit="FT" >   57.88 </htailarm>
+        <vtailarea unit="FT2">  248.79 </vtailarea>
+        <vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
-<propulsion>
+    <propulsion>
 
-	<engine file="cfm56_5b4">
-	<location unit="IN">
-		<x> 620.0683 </x>
-		<y> -226.575 </y>
-		<z> -45.567 </z>
-	</location>
-	<orient unit="DEG">
-		<roll> 0.0 </roll>
-		<pitch> 2.2 </pitch>
-		<yaw> 1 </yaw>
-	</orient>
-	<feed>7</feed>
-	<thruster file="direct">
-		<location unit="IN">
-		<x> 655.4820 </x>
-		<y> -226.575 </y>
-		<z> 0.000 </z>
-		</location>
-		<orient unit="DEG">
-		<roll> 0.0 </roll>
-		<pitch> 2.2 </pitch>
-		<yaw> 1 </yaw>
-		</orient>
-	</thruster>
-	</engine>
+        <engine file="cfm56_5b4">
+            <location unit="IN">
+                <x> 620.0683 </x>
+                <y> -226.575 </y>
+                <z> -45.567 </z>
+            </location>
+            <orient unit="DEG">
+                <roll> 0.0 </roll>
+                <pitch> 2.2 </pitch>
+                <yaw> 1 </yaw>
+            </orient>
+            <feed>7</feed>
+            <thruster file="direct">
+                <location unit="IN">
+                    <x> 655.4820 </x>
+                    <y> -226.575 </y>
+                    <z> 0.000 </z>
+                </location>
+                <orient unit="DEG">
+                    <roll> 0.0 </roll>
+                    <pitch> 2.2 </pitch>
+                    <yaw> 1 </yaw>
+                </orient>
+            </thruster>
+        </engine>
 
-	<engine file="cfm56_5b4">
-	<location unit="IN">
-		<x> 620.0683 </x>
-		<y> 226.575 </y>
-		<z> -45.567 </z>
-	</location>
-	<orient unit="DEG">
-		<roll> 0.0 </roll>
-		<pitch> 2.2 </pitch>
-		<yaw> -1 </yaw>
-	</orient>
-	<feed>8</feed>
-	<thruster file="direct">
-		<location unit="IN">
-		<x> 655.4820 </x>
-		<y> 226.575 </y>
-		<z> 0.000 </z>
-		</location>
-		<orient unit="DEG">
-		<roll> 0.0 </roll>
-		<pitch> 2.2 </pitch>
-		<yaw> -1 </yaw>
-		</orient>
-	</thruster>
-	</engine>
+        <engine file="cfm56_5b4">
+            <location unit="IN">
+                <x> 620.0683 </x>
+                <y> 226.575 </y>
+                <z> -45.567 </z>
+            </location>
+            <orient unit="DEG">
+                <roll> 0.0 </roll>
+                <pitch> 2.2 </pitch>
+                <yaw> -1 </yaw>
+            </orient>
+            <feed>8</feed>
+            <thruster file="direct">
+                <location unit="IN">
+                    <x> 655.4820 </x>
+                    <y> 226.575 </y>
+                    <z> 0.000 </z>
+                </location>
+                <orient unit="DEG">
+                    <roll> 0.0 </roll>
+                    <pitch> 2.2 </pitch>
+                    <yaw> -1 </yaw>
+                </orient>
+            </thruster>
+        </engine>
 
 
-	<tank type="FUEL">    <!-- Left Tank (Wing tip Ventilation Surge) 0 -->
-		<location unit="IN">
-			<x> 783.0709 </x>
-			<y> -574.4148 </y>
-			<z> 3.1080 </z>
-		</location>
-		<capacity unit="LBS"> 412 </capacity><!-- 1 percent of total capacity, needs 20C to be filled -->
-		<contents unit="LBS"> 0 </contents>
-		
-		<priority>4</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- Left Tank (Outer) 1 -->
-		<location unit="IN">
-			<x> 739.5669 </x>
-			<y> -457.4259 </y>
-			<z> -8.0898 </z>
-		</location>
-		<capacity unit="LBS"> 1520.00 </capacity><!-- correct by FCOM -->
-		<contents unit="LBS"> 1520 </contents><!-- outer filled first than inner -->
-		<standpipe unit="LBS">21</standpipe><!-- minimun fuel on pipes -->
-		<priority>2</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- Left Tank (Inner) 2 -->
-		<location unit="IN">
-			<x> 652.5591 </x>
-			<y> -236.2992 </y>
-			<z> -33.9470 </z>
-		</location>
-		<capacity unit="LBS"> 11982 </capacity><!-- correct by FCOM -->
-		<contents unit="LBS"> 4480 </contents>
-		<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
-		<priority>3</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- Center Tank 3 -->
-		<location unit="IN">
-			<x> 522.0473 </x>
-			<y> 0 </y>
-			<z> -47.0 </z>
-		</location>
-		<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-		<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-		<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
-		<priority>1</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- Right Tank (Inner) 4 -->
-		<location unit="IN">
-			<x> 652.5591 </x>
-			<y> 236.2992 </y>
-			<z> -33.9470 </z>
-		</location>
-		<capacity unit="LBS"> 11982 </capacity><!-- correct by FCOM -->
-		<contents unit="LBS"> 4480 </contents>
-		<standpipe unit="LBS">31</standpipe><!-- minimum fuel on pipes -->
-		<priority>3</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- Right Tank (Outer) 5 -->
-		<location unit="IN">
-			<x> 739.5669 </x>
-			<y> 457.4259 </y>
-			<z> -8.0898 </z>
-		</location>
-		<capacity unit="LBS"> 1520 </capacity><!-- need review -->
-		<contents unit="LBS"> 1520 </contents><!-- outer tank filled first than inner tank -->
-		<standpipe unit="LBS">21</standpipe><!-- minimun fuel on pipes -->
-		<priority>2</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- Right Tank (Wing tip Ventilation Surge) 6 -->
-		<location unit="IN">
-			<x> 783.0709 </x>
-			<y> 574.4148 </y>
-			<z> 3.1080 </z>
-		</location>
-		<capacity unit="LBS"> 412 </capacity><!-- 1 percent of total fuel capacity, needs 20C-->
-		<contents unit="LBS"> 0 </contents>
-		<priority>4</priority>
-		<type>JET-A1</type>
-		<temperature>50</temperature>
-	</tank>
-	<tank type="FUEL">    <!-- LEFT FUEL PIPES (Engine 1 feed from this) -->
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-45.567</z>
-		</location>
-		<capacity unit="LBS"> 100 </capacity><!-- need review -->
-		<contents unit="LBS"> 0 </contents>
-		<priority>1</priority>
-		<type>JET-A1</type>
-	</tank>
-	<tank type="FUEL">    <!-- RIGHT FUEL PIPES (Engine 2 feed from this) -->
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-45.567</z>
-		</location>
-		<capacity unit="LBS"> 100 </capacity><!-- need review -->
-		<contents unit="LBS"> 0 </contents>
-		<priority>1</priority>
-		<type>JET-A1</type>
-	</tank>
-</propulsion>
+        <tank type="FUEL">
+            <!-- Left Tank (Wing tip Ventilation Surge) 0 -->
+            <location unit="IN">
+                <x> 783.0709 </x>
+                <y> -574.4148 </y>
+                <z> 3.1080 </z>
+            </location>
+            <capacity unit="LBS"> 412 </capacity>
+            <!-- 1 percent of total capacity, needs 20C to be filled -->
+            <contents unit="LBS"> 0 </contents>
 
-<system file="pushback" />
-<system file="fuel" />
-<system file="glass-effect1" />
-<system file="it-fbw" />
-<system file="fmgc" />
-<system file="fcs" />
+            <priority>4</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- Left Tank (Outer) 1 -->
+            <location unit="IN">
+                <x> 739.5669 </x>
+                <y> -457.4259 </y>
+                <z> -8.0898 </z>
+            </location>
+            <capacity unit="LBS"> 1520.00 </capacity>
+            <!-- correct by FCOM -->
+            <contents unit="LBS"> 1520 </contents>
+            <!-- outer filled first than inner -->
+            <standpipe unit="LBS">21</standpipe>
+            <!-- minimun fuel on pipes -->
+            <priority>2</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- Left Tank (Inner) 2 -->
+            <location unit="IN">
+                <x> 652.5591 </x>
+                <y> -236.2992 </y>
+                <z> -33.9470 </z>
+            </location>
+            <capacity unit="LBS"> 11982 </capacity>
+            <!-- correct by FCOM -->
+            <contents unit="LBS"> 4480 </contents>
+            <standpipe unit="LBS">31</standpipe>
+            <!-- minimun fuel on pipes -->
+            <priority>3</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- Center Tank 3 -->
+            <location unit="IN">
+                <x> 522.0473 </x>
+                <y> 0 </y>
+                <z> -47.0 </z>
+            </location>
+            <capacity unit="LBS"> 14281 </capacity>
+            <!-- correct by FCOM -->
+            <contents unit="LBS"> 0 </contents>
+            <!-- wing tanks filled first -->
+            <standpipe unit="LBS">43</standpipe>
+            <!-- minimun fuel on pipes -->
+            <priority>1</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- Right Tank (Inner) 4 -->
+            <location unit="IN">
+                <x> 652.5591 </x>
+                <y> 236.2992 </y>
+                <z> -33.9470 </z>
+            </location>
+            <capacity unit="LBS"> 11982 </capacity>
+            <!-- correct by FCOM -->
+            <contents unit="LBS"> 4480 </contents>
+            <standpipe unit="LBS">31</standpipe>
+            <!-- minimum fuel on pipes -->
+            <priority>3</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- Right Tank (Outer) 5 -->
+            <location unit="IN">
+                <x> 739.5669 </x>
+                <y> 457.4259 </y>
+                <z> -8.0898 </z>
+            </location>
+            <capacity unit="LBS"> 1520 </capacity>
+            <!-- need review -->
+            <contents unit="LBS"> 1520 </contents>
+            <!-- outer tank filled first than inner tank -->
+            <standpipe unit="LBS">21</standpipe>
+            <!-- minimun fuel on pipes -->
+            <priority>2</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- Right Tank (Wing tip Ventilation Surge) 6 -->
+            <location unit="IN">
+                <x> 783.0709 </x>
+                <y> 574.4148 </y>
+                <z> 3.1080 </z>
+            </location>
+            <capacity unit="LBS"> 412 </capacity>
+            <!-- 1 percent of total fuel capacity, needs 20C-->
+            <contents unit="LBS"> 0 </contents>
+            <priority>4</priority>
+            <type>JET-A1</type>
+            <temperature>50</temperature>
+        </tank>
+        <tank type="FUEL">
+            <!-- LEFT FUEL PIPES (Engine 1 feed from this) -->
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-45.567</z>
+            </location>
+            <capacity unit="LBS"> 100 </capacity>
+            <!-- need review -->
+            <contents unit="LBS"> 0 </contents>
+            <priority>1</priority>
+            <type>JET-A1</type>
+        </tank>
+        <tank type="FUEL">
+            <!-- RIGHT FUEL PIPES (Engine 2 feed from this) -->
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-45.567</z>
+            </location>
+            <capacity unit="LBS"> 100 </capacity>
+            <!-- need review -->
+            <contents unit="LBS"> 0 </contents>
+            <priority>1</priority>
+            <type>JET-A1</type>
+        </tank>
+    </propulsion>
 
-<flight_control name="none"/>
+    <system file="pushback" />
+    <system file="fuel" />
+    <system file="glass-effect1" />
+    <system file="fmgc" />
+    <system file="fcs" />
 
-<aerodynamics file="Systems/a320-aerodynamics.xml" />
+	<flight_control name="none"/>
 
-<external_reactions>
-	<force name="pushback" frame="BODY">
-		<location unit="IN">
-			<x>294</x>
-			<y>0</y>
-			<z>-149</z>
-		</location>
-		<direction>
-			<x>1</x>
-			<y>0</y>
-			<z>0</z>
-		</direction>
-	</force>
-</external_reactions>
+    <aerodynamics file="Systems/a320-aerodynamics.xml" />
+
+    <external_reactions>
+        <force name="pushback" frame="BODY">
+            <location unit="IN">
+                <x>294</x>
+                <y>0</y>
+                <z>-149</z>
+            </location>
+            <direction>
+                <x>1</x>
+                <y>0</y>
+                <z>0</z>
+            </direction>
+        </force>
+    </external_reactions>
 </fdm_config>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index 07e02228..0715dfdd 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -22,17 +22,37 @@
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-1.png</path>
+				<path>Splash/A320/a320-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-2.png</path>
+				<path>Splash/A320/a320-2.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320-3.png</path>
+				<path>Splash/A320/a320-3.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-4.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-5.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-6.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320/a320-7.png</path>
 			</preview>
 		</previews>
 
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 20ce4b33..3eb2f7a5 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A320-main.xml b/A320-main.xml
index e063591e..5f6f071b 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -104,7 +104,7 @@
 				<path>Aircraft/A320Family/Systems/hydraulics.xml</path>
 			</autopilot>
 			<autopilot n="2">
-				<path>Aircraft/A320Family/Systems/it-fbw-b.xml</path>
+				<path>Aircraft/A320Family/Systems/it-fbw.xml</path>
 			</autopilot>
 			<autopilot n="3">
 				<path>Aircraft/A320Family/Systems/fmgc-b.xml</path>
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index a7666151..4c040bc7 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -22,22 +22,27 @@
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320n-1.png</path>
+				<path>Splash/A320N/a320n-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320n-2.png</path>
+				<path>Splash/A320N/a320n-2.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320n-3.png</path>
+				<path>Splash/A320N/a320n-3.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a320n-4.png</path>
+				<path>Splash/A320N/a320n-4.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A320N/a320n-5.png</path>
 			</preview>
 		</previews>
 		
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index e6797f5d..12b821ef 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml
index b0f0108b..b3142273 100644
--- a/A321-200-CFM-set.xml
+++ b/A321-200-CFM-set.xml
@@ -22,12 +22,17 @@
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a321-1.png</path>
+				<path>Splash/A321/a321-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a321-2.png</path>
+				<path>Splash/A321/a321-2.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A321/a321-3.png</path>
 			</preview>
 		</previews>
 
diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml
index f072843c..cd910f07 100644
--- a/A321-200-CFM.xml
+++ b/A321-200-CFM.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index d979df1d..661ae499 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -22,12 +22,17 @@
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a321-1.png</path>
+				<path>Splash/A321/a321-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a321-2.png</path>
+				<path>Splash/A321/a321-2.png</path>
+			</preview>
+			<preview>
+				<type>exterior</type>
+				<splash type="bool">true</splash>
+				<path>Splash/A321/a321-3.png</path>
 			</preview>
 		</previews>
 
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index 416fe92b..bac1a2f5 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -20,362 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">1248922</ixx>
-	<iyy unit="SLUG*FT2">1800728</iyy>
-	<izz unit="SLUG*FT2">2894800</izz>
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixy unit="SLUG*FT2">   0</ixy>
-	<ixz unit="SLUG*FT2">5800</ixz>
-	<iyz unit="SLUG*FT2">   0</iyz>
-	<emptywt unit="LBS">80431</emptywt>
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
+
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -549,7 +557,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/A321neo-CFM-set.xml b/A321neo-CFM-set.xml
index 01d600fb..a15e21d2 100644
--- a/A321neo-CFM-set.xml
+++ b/A321neo-CFM-set.xml
@@ -18,23 +18,18 @@
 			</livery>
 		</model>
 		
-		<!--previews>
+		<previews>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a321n-1.png</path>
+				<path>Splash/A321N/a321n-1.png</path>
 			</preview>
 			<preview>
 				<type>exterior</type>
 				<splash type="bool">true</splash>
-				<path>Splash/a321n-2.png</path>
+				<path>Splash/A321N/a321n-2.png</path>
 			</preview>
-			<preview>
-				<type>exterior</type>
-				<splash type="bool">true</splash>
-				<path>Splash/a321n-3.png</path>
-			</preview>
-		</previews!-->
+		</previews>
 
 		<view>
 			<name>Pilot View</name>
diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml
index e224c5c7..227b95bb 100644
--- a/A321neo-CFM.xml
+++ b/A321neo-CFM.xml
@@ -20,388 +20,370 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	<!-- location name="AERORP" unit="IN">
-		<x> 642.122 </x>
-		<y> 0 </y>
-		<z> -25.2091 </z>
-	</location -->
-	<location name="AERORP" unit="IN">
-		<x> 700.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
+       <location name="AERORP" unit="IN">
+            <x> 700.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<location name="EYEPOINT" unit="IN">
-		<x> 80 </x>
-		<y> -30 </y>
-		<z> 70 </z>
-	</location>
+        <location name="EYEPOINT" unit="IN">
+            <x> 80 </x>
+            <y> -30 </y>
+            <z> 70 </z>
+        </location>
 
-	<location name="VRP" unit="IN">
-		<x> 661.1 </x>
-		<y> 0 </y>
-		<z> -37 </z>
-	</location>
+        <location name="VRP" unit="IN">
+            <x> 661.1 </x>
+            <y> 0 </y>
+            <z> -37 </z>
+        </location>
 
-</metrics>
+    </metrics>
 
-<mass_balance>
-	<ixx unit="SLUG*FT2">    611903 </ixx>
-	<iyy unit="SLUG*FT2">   1735389 </iyy>
-	<izz unit="SLUG*FT2">   2301293 </izz> 
-<!--
-___________________A320_________A330__________A340
-BOW_____________178000________270000________283925
-SPAN______________144___________198___________209
-LENGTH____________153___________209___________209
-ROLL MOI_________1725000______5727777_______10613448
-PITCH MOI________2550000______19040141_______13904249
-YAW MOI_________3950000______23089847_______24848934
+    <mass_balance>
+		<ixx unit="SLUG*FT2"> 611903</ixx>
+		<iyy unit="SLUG*FT2">1735389</iyy>
+		<izz unit="SLUG*FT2">2301293</izz>
 
-	<ixx unit="SLUG*FT2">   2262183 </ixx>
-	<iyy unit="SLUG*FT2">   3172439 </iyy>
-	<izz unit="SLUG*FT2">   3337024 </izz>
+        <ixy unit="SLUG*FT2">0</ixy>
+        <ixz unit="SLUG*FT2">0</ixz>
+        <iyz unit="SLUG*FT2">0</iyz>
+        <emptywt unit="LBS">80431</emptywt>
 
-	<ixx unit="SLUG*FT2">1725000</ixx>
-	<iyy unit="SLUG*FT2">2550000</iyy>
-	<izz unit="SLUG*FT2">3950000</izz> -->
+        <location name="CG" unit="IN">
+            <x> 652.00 </x>
+            <y> 0 </y>
+            <z> 0.00 </z>
+        </location>
 
-	<ixy unit="SLUG*FT2">         0 </ixy>
-	<ixz unit="SLUG*FT2">         0 </ixz>
-	<iyz unit="SLUG*FT2">         0 </iyz>
-	<emptywt unit="LBS">80431</emptywt> <!-- #ref-1 page 67, WV016. 90927lbs - 5248x2 (engines)=80431lbs-->
-
-	<!-- 	#### PB: That makes no sense, the whole aircraft is 1479.1339 inches long. 650inches eqauls to about 43.95% MAC with the Airbus limits according to the AMM between 45% and 49%
-		Also: The z-axis is -41.73 inches under the zero line of the plane while the pressure point is only -25,91 under the same line and slightly ahead, that causes the plane to behave quite unstable
-	-->
-	<!-- location name="CG" unit="IN">
-		<! - -x> 642.122 </x- - >
-		<x> 650.122 </x><! - - At zero load of fuel and cargo/pax the CG goes to 642 - - >
-		<y> 0 </y>
-		<z> -41.7398 </z>
-	</location -->
-	<location name="CG" unit="IN">
-		<x> 652.00 </x>
-		<y> 0 </y>
-		<z> 0.00 </z>
-	</location>
-
-	<pointmass name="Cockpit Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
-		<location name="POINTMASS" unit="IN">
-			<x>200</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cabin Crew">
-		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
-		<location name="POINTMASS" unit="IN">
-			<x>696</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0A (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>470.1711</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0B (60 seats)">
-		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>809.5669</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="PAX 0C (54 seats)">
-		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
-		<location name="POINTMASS" unit="IN">
-			<x>1163.2729</x>
-			<y>0</y>
-			<z>0</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 1">
-		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>383.4792</x>
-			<y>0</y>
-			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
-		</location>
-	</pointmass>
-	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-	<pointmass name="Cargo Hold 3">
-		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>849.1324</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 4">
-		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>931.0653</x>
-			<y>0</y>
-			<z>-29.5</z>
-		</location>
-	</pointmass>
-	<pointmass name="Cargo Hold 5">
-		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
-		<location name="POINTMASS" unit="IN">
-			<x>1068.2634</x>
-			<y>0</y>
-			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-		</location>
-	</pointmass>
+        <pointmass name="Cockpit Crew">
+            <weight unit="LBS">400</weight>
+            <!-- MAX: 400lbs, two pilots-->
+            <location name="POINTMASS" unit="IN">
+                <x>200</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cabin Crew">
+            <weight unit="LBS">600</weight>
+            <!-- MAX: 1320lbs, up to six flight-attendants-->
+            <location name="POINTMASS" unit="IN">
+                <x>696</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0A (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>470.1711</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0B (60 seats)">
+            <weight unit="LBS">6600</weight>
+            <!-- MAX: 13200lbs, 60 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>809.5669</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="PAX 0C (54 seats)">
+            <weight unit="LBS">5940</weight>
+            <!-- MAX: 11880lbs, 54 seats -->
+            <location name="POINTMASS" unit="IN">
+                <x>1163.2729</x>
+                <y>0</y>
+                <z>0</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 1">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 7500.126lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>383.4792</x>
+                <y>0</y>
+                <z>-29.5</z>
+                <!-- 1.5m and now half of it for the center point of the load -->
+            </location>
+        </pointmass>
+        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+        <pointmass name="Cargo Hold 3">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 5384.414lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>849.1324</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 4">
+            <weight unit="LBS">1500</weight>
+            <!-- MAX: 4651.754lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>931.0653</x>
+                <y>0</y>
+                <z>-29.5</z>
+            </location>
+        </pointmass>
+        <pointmass name="Cargo Hold 5">
+            <weight unit="LBS">2000</weight>
+            <!-- MAX: 3300.320lbs -->
+            <location name="POINTMASS" unit="IN">
+                <x>1068.2634</x>
+                <y>0</y>
+                <z>0</z>
+                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+            </location>
+        </pointmass>
 
 
-</mass_balance>
+    </mass_balance>
 
-<ground_reactions>
-	<!-- REF-1 page 165 + 271  -->
-	<contact type="BOGEY" name="NOSE_LG">
-		<location unit="IN">
-			<x> 197.6772 </x>
-			<y> 0 </y>
-			<z> -137.9617 </z> 
-		</location>
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
-		<brake_group> NONE </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="LEFT_MLG">
-		<location unit="IN">
-			<!--<x> 699.9243 </x>-->
-			<x> 695.3149 </x>
-			<y> -149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> LEFT </brake_group>
-		<retractable>1</retractable>
-	</contact>
-	<contact type="BOGEY" name="RIGHT_MLG">
-		<location unit="IN">
-			<!-- <x> 697.3425 </x> It should be right left simetric
+    <ground_reactions>
+        <!-- REF-1 page 165 + 271  -->
+        <contact type="BOGEY" name="NOSE_LG">
+            <location unit="IN">
+                <x> 197.6772 </x>
+                <y> 0 </y>
+                <z> -137.9617 </z>
+            </location>
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+            <max_steer unit="DEG"> 70 </max_steer>
+            <!-- REF-1 page 133 -->
+            <brake_group> NOSE </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="LEFT_MLG">
+            <location unit="IN">
+                <!--<x> 699.9243 </x>-->
+                <x> 695.3149 </x>
+                <y> -149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> LEFT </brake_group>
+            <retractable>1</retractable>
+        </contact>
+        <contact type="BOGEY" name="RIGHT_MLG">
+            <location unit="IN">
+                <!-- <x> 697.3425 </x> It should be right left simetric
 			<x> 699.9243 </x> -->
-			<x> 695.3149 </x>
-			<y> 149.4094 </y>
-			<z> -150.4824 </z>
-		</location>
-<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-		<static_friction> 0.8 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.02 </rolling_friction>
-		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+                <x> 695.3149 </x>
+                <y> 149.4094 </y>
+                <z> -150.4824 </z>
+            </location>
+            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+            <static_friction> 0.8 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.02 </rolling_friction>
+            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
 		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> RIGHT </brake_group>
-		<retractable>1</retractable>
-	</contact>
+            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> RIGHT </brake_group>
+            <retractable>1</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="NOSE_1">
-		<location unit="IN">
-			<x> 37.7953 </x>
-			<y> 0 </y>
-			<z> -38.1374 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="NOSE_2">
-		<location unit="IN">
-			<x> 128.1102 </x>
-			<y> 0 </y>
-			<z> -55.0271 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_1">
-		<location unit="IN">
-			<x> 274.0157 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="CENTER_2">
-		<location unit="IN">
-			<x> 930 </x>
-			<y> 0 </y>
-			<z> -60.0665 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="NOSE_1">
+            <location unit="IN">
+                <x> 37.7953 </x>
+                <y> 0 </y>
+                <z> -38.1374 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="NOSE_2">
+            <location unit="IN">
+                <x> 128.1102 </x>
+                <y> 0 </y>
+                <z> -55.0271 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_1">
+            <location unit="IN">
+                <x> 274.0157 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="CENTER_2">
+            <location unit="IN">
+                <x> 930 </x>
+                <y> 0 </y>
+                <z> -60.0665 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
-	<contact type="STRUCTURE" name="ENG_1">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="ENG_2">
-		<location unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-95.567</z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
+        <contact type="STRUCTURE" name="ENG_1">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>-226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="ENG_2">
+            <location unit="IN">
+                <x>589.735</x>
+                <y>226.575</y>
+                <z>-95.567</z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.5 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
 
 
-	<contact type="STRUCTURE" name="TAIL_1">
-		<location unit="IN">
-			<x> 1097.9921 </x>
-			<y> 0 </y>
-			<z> -44.7722 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_2">
-		<location unit="IN">
-			<x> 1225 </x>
-			<y> 0 </y>
-			<z> -18.8067 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_3">
-		<location unit="IN">
-			<x> 1341.6142 </x>
-			<y> 0 </y>
-			<z> -10.2599 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="TAIL_4">
-		<location unit="IN">
-			<x> 1469.0945 </x>
-			<y> 0 </y>
-			<z> 47.4138 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_1">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> -667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-	<contact type="STRUCTURE" name="WING_TIP_2">
-		<location unit="IN">
-			<x> 838.8898 </x>
-			<y> 667.5197 </y>
-			<z> 35.7926 </z>
-		</location>
-		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_friction>
-		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-		<max_steer unit="DEG"> 0.0 </max_steer>
-		<brake_group> NONE </brake_group>
-		<retractable>0</retractable>
-	</contact>
-</ground_reactions>
+        <contact type="STRUCTURE" name="TAIL_1">
+            <location unit="IN">
+                <x> 1097.9921 </x>
+                <y> 0 </y>
+                <z> -44.7722 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_2">
+            <location unit="IN">
+                <x> 1225 </x>
+                <y> 0 </y>
+                <z> -18.8067 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_3">
+            <location unit="IN">
+                <x> 1341.6142 </x>
+                <y> 0 </y>
+                <z> -10.2599 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="TAIL_4">
+            <location unit="IN">
+                <x> 1469.0945 </x>
+                <y> 0 </y>
+                <z> 47.4138 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_1">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> -667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 0.4 </dynamic_friction>
+            <rolling_friction> 0.4 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+        <contact type="STRUCTURE" name="WING_TIP_2">
+            <location unit="IN">
+                <x> 838.8898 </x>
+                <y> 667.5197 </y>
+                <z> 35.7926 </z>
+            </location>
+            <static_friction> 1.0 </static_friction>
+            <dynamic_friction> 1 </dynamic_friction>
+            <rolling_friction> 1 </rolling_friction>
+            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+            <max_steer unit="DEG"> 0.0 </max_steer>
+            <brake_group> NONE </brake_group>
+            <retractable>0</retractable>
+        </contact>
+    </ground_reactions>
 
 <propulsion>
 
@@ -575,7 +557,6 @@ YAW MOI_________3950000______23089847_______24848934
 <system file="pushback" />
 <system file="fuel" />
 <system file="glass-effect1" />
-<system file="it-fbw" />
 <system file="fmgc" />
 <system file="fcs" />
 
diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
index 61d11909..b248eb52 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml
@@ -897,15 +897,15 @@
     	<object-name>n11</object-name>
     	<property>/engines/engine/n1</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>-13</dep></entry>
-			<entry><ind> 50</ind><dep> 53</dep></entry>
-			<entry><ind>100</ind><dep>152</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<entry><ind> 22.4</ind><dep>-127</dep></entry>
+			<entry><ind> 50.0</ind><dep> -58</dep></entry>
+			<entry><ind>100.0</ind><dep>  42</dep></entry>
+			<entry><ind>110.0</ind><dep>  65</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0350</y-m>
-    		<z-m>0.0591</z-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -919,15 +919,15 @@
     	<object-name>n12</object-name>
     	<property>/engines/engine[1]/n1</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>-13</dep></entry>
-			<entry><ind> 50</ind><dep> 53</dep></entry>
-			<entry><ind>100</ind><dep>152</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<entry><ind> 22.4</ind><dep>-127</dep></entry>
+			<entry><ind> 50.0</ind><dep> -58</dep></entry>
+			<entry><ind>100.0</ind><dep>  42</dep></entry>
+			<entry><ind>110.0</ind><dep>  65</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
     		<y-m>0.0335</y-m>
-    		<z-m>0.0591</z-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -941,15 +941,15 @@
     	<object-name>n1limy1</object-name>
     	<property>/controls/engines/n1-limit</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>-13</dep></entry>
-			<entry><ind> 50</ind><dep> 53</dep></entry>
-			<entry><ind>100</ind><dep>152</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<entry><ind> 22.4</ind><dep>-127</dep></entry>
+			<entry><ind> 50.0</ind><dep> -58</dep></entry>
+			<entry><ind>100.0</ind><dep>  42</dep></entry>
+			<entry><ind>110.0</ind><dep>  65</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0350</y-m>
-    		<z-m>0.0591</z-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -963,15 +963,15 @@
     	<object-name>n1limy2</object-name>
     	<property>/controls/engines/n1-limit</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>-13</dep></entry>
-			<entry><ind> 50</ind><dep> 53</dep></entry>
-			<entry><ind>100</ind><dep>152</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<entry><ind> 22.4</ind><dep>-127</dep></entry>
+			<entry><ind> 50.0</ind><dep> -58</dep></entry>
+			<entry><ind>100.0</ind><dep>  42</dep></entry>
+			<entry><ind>110.0</ind><dep>  65</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
     		<y-m>0.0335</y-m>
-    		<z-m>0.0591</z-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -985,15 +985,15 @@
     	<object-name>thrpos1</object-name>
     	<property>/engines/engine[0]/n1-cmd</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>-13</dep></entry>
-			<entry><ind> 50</ind><dep> 53</dep></entry>
-			<entry><ind>100</ind><dep>152</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<entry><ind> 22.4</ind><dep>-127</dep></entry>
+			<entry><ind> 50.0</ind><dep> -58</dep></entry>
+			<entry><ind>100.0</ind><dep>  42</dep></entry>
+			<entry><ind>110.0</ind><dep>  65</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0350</y-m>
-    		<z-m>0.0591</z-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1007,15 +1007,15 @@
     	<object-name>thrpos2</object-name>
     	<property>/engines/engine[1]/n1-cmd</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>-13</dep></entry>
-			<entry><ind> 50</ind><dep> 53</dep></entry>
-			<entry><ind>100</ind><dep>152</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<entry><ind> 22.4</ind><dep>-127</dep></entry>
+			<entry><ind> 50.0</ind><dep> -58</dep></entry>
+			<entry><ind>100.0</ind><dep>  42</dep></entry>
+			<entry><ind>110.0</ind><dep>  65</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
     		<y-m>0.0335</y-m>
-    		<z-m>0.0591</z-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1031,9 +1031,9 @@
     	<object-name>egt1</object-name>
     	<property>/engines/engine/egt-actual</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep>   0</dep></entry>
-			<entry><ind>500</ind><dep>  90</dep></entry>
-			<entry><ind>1000</ind><dep>180</dep></entry>
+			<entry><ind>   0</ind><dep>-90</dep></entry>
+			<entry><ind> 500</ind><dep>  0</dep></entry>
+			<entry><ind>1000</ind><dep> 90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1052,13 +1052,13 @@
     	<object-name>egt2</object-name>
     	<property>/engines/engine[1]/egt-actual</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep>   0</dep></entry>
-			<entry><ind>500</ind><dep>  90</dep></entry>
-			<entry><ind>1000</ind><dep>180</dep></entry>
+			<entry><ind>   0</ind><dep>-90</dep></entry>
+			<entry><ind> 500</ind><dep>  0</dep></entry>
+			<entry><ind>1000</ind><dep> 90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>0.0334</y-m>
+    		<y-m>0.0335</y-m>
     		<z-m>0.0271</z-m>
     	</center>
     	<axis>
diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
index 240f5085..a69f42b3 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
@@ -1095,18 +1095,17 @@
     	<object-name>epr1</object-name>
     	<property>/engines/engine/epr-actual</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep>-18</dep></entry>
-			<entry><ind>1.000</ind><dep>-11</dep></entry>
-			<entry><ind>1.100</ind><dep> 28</dep></entry>
-			<entry><ind>1.200</ind><dep> 63</dep></entry>
-			<entry><ind>1.400</ind><dep>125</dep></entry>
-			<entry><ind>1.600</ind><dep>191</dep></entry>
-			<entry><ind>1.650</ind><dep>208</dep></entry>
+			<entry><ind>0.990</ind><dep>-129</dep></entry>
+			<entry><ind>1.000</ind><dep>-120</dep></entry>
+			<entry><ind>1.200</ind><dep> -50</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  82</dep></entry>
+			<entry><ind>1.650</ind><dep>  97</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0350</y-m>
-    		<z-m>0.0591</z-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1120,18 +1119,17 @@
     	<object-name>epr2</object-name>
     	<property>/engines/engine[1]/epr-actual</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep>-18</dep></entry>
-			<entry><ind>1.000</ind><dep>-11</dep></entry>
-			<entry><ind>1.100</ind><dep> 28</dep></entry>
-			<entry><ind>1.200</ind><dep> 63</dep></entry>
-			<entry><ind>1.400</ind><dep>125</dep></entry>
-			<entry><ind>1.600</ind><dep>191</dep></entry>
-			<entry><ind>1.650</ind><dep>208</dep></entry>
+			<entry><ind>0.990</ind><dep>-129</dep></entry>
+			<entry><ind>1.000</ind><dep>-120</dep></entry>
+			<entry><ind>1.200</ind><dep> -50</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  82</dep></entry>
+			<entry><ind>1.650</ind><dep>  97</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
     		<y-m>0.0335</y-m>
-    		<z-m>0.0591</z-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1145,18 +1143,17 @@
     	<object-name>eprlimy1</object-name>
     	<property>/controls/engines/epr-limit</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep>-18</dep></entry>
-			<entry><ind>1.000</ind><dep>-11</dep></entry>
-			<entry><ind>1.100</ind><dep> 28</dep></entry>
-			<entry><ind>1.200</ind><dep> 63</dep></entry>
-			<entry><ind>1.400</ind><dep>125</dep></entry>
-			<entry><ind>1.600</ind><dep>191</dep></entry>
-			<entry><ind>1.650</ind><dep>208</dep></entry>
+			<entry><ind>0.990</ind><dep>-129</dep></entry>
+			<entry><ind>1.000</ind><dep>-120</dep></entry>
+			<entry><ind>1.200</ind><dep> -50</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  82</dep></entry>
+			<entry><ind>1.650</ind><dep>  97</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0350</y-m>
-    		<z-m>0.0591</z-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1170,18 +1167,17 @@
     	<object-name>eprlimy2</object-name>
     	<property>/controls/engines/epr-limit</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep>-18</dep></entry>
-			<entry><ind>1.000</ind><dep>-11</dep></entry>
-			<entry><ind>1.100</ind><dep> 28</dep></entry>
-			<entry><ind>1.200</ind><dep> 63</dep></entry>
-			<entry><ind>1.400</ind><dep>125</dep></entry>
-			<entry><ind>1.600</ind><dep>191</dep></entry>
-			<entry><ind>1.650</ind><dep>208</dep></entry>
+			<entry><ind>0.990</ind><dep>-129</dep></entry>
+			<entry><ind>1.000</ind><dep>-120</dep></entry>
+			<entry><ind>1.200</ind><dep> -50</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  82</dep></entry>
+			<entry><ind>1.650</ind><dep>  97</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
     		<y-m>0.0335</y-m>
-    		<z-m>0.0591</z-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1195,18 +1191,17 @@
     	<object-name>thrpos1</object-name>
     	<property>/engines/engine[0]/epr-cmd</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep>-18</dep></entry>
-			<entry><ind>1.000</ind><dep>-11</dep></entry>
-			<entry><ind>1.100</ind><dep> 28</dep></entry>
-			<entry><ind>1.200</ind><dep> 63</dep></entry>
-			<entry><ind>1.400</ind><dep>125</dep></entry>
-			<entry><ind>1.600</ind><dep>191</dep></entry>
-			<entry><ind>1.650</ind><dep>208</dep></entry>
+			<entry><ind>0.990</ind><dep>-129</dep></entry>
+			<entry><ind>1.000</ind><dep>-120</dep></entry>
+			<entry><ind>1.200</ind><dep> -50</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  82</dep></entry>
+			<entry><ind>1.650</ind><dep>  97</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0350</y-m>
-    		<z-m>0.0591</z-m>
+    		<y-m>-0.0351</y-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1220,18 +1215,17 @@
     	<object-name>thrpos2</object-name>
     	<property>/engines/engine[1]/epr-cmd</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep>-18</dep></entry>
-			<entry><ind>1.000</ind><dep>-11</dep></entry>
-			<entry><ind>1.100</ind><dep> 28</dep></entry>
-			<entry><ind>1.200</ind><dep> 63</dep></entry>
-			<entry><ind>1.400</ind><dep>125</dep></entry>
-			<entry><ind>1.600</ind><dep>191</dep></entry>
-			<entry><ind>1.650</ind><dep>208</dep></entry>
+			<entry><ind>0.990</ind><dep>-129</dep></entry>
+			<entry><ind>1.000</ind><dep>-120</dep></entry>
+			<entry><ind>1.200</ind><dep> -50</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  82</dep></entry>
+			<entry><ind>1.650</ind><dep>  97</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
     		<y-m>0.0335</y-m>
-    		<z-m>0.0591</z-m>
+    		<z-m>0.05912</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1247,9 +1241,9 @@
     	<object-name>egt1</object-name>
     	<property>/engines/engine/egt-actual</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep>  0</dep></entry>
-			<entry><ind>400</ind><dep> 90</dep></entry>
-			<entry><ind>800</ind><dep>180</dep></entry>
+			<entry><ind>  0</ind><dep>-90</dep></entry>
+			<entry><ind>400</ind><dep>  0</dep></entry>
+			<entry><ind>800</ind><dep> 90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1268,13 +1262,13 @@
     	<object-name>egt2</object-name>
     	<property>/engines/engine[1]/egt-actual</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep>  0</dep></entry>
-			<entry><ind>400</ind><dep> 90</dep></entry>
-			<entry><ind>800</ind><dep>180</dep></entry>
+			<entry><ind>  0</ind><dep>-90</dep></entry>
+			<entry><ind>400</ind><dep>  0</dep></entry>
+			<entry><ind>800</ind><dep> 90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>0.0334</y-m>
+    		<y-m>0.0335</y-m>
     		<z-m>0.0271</z-m>
     	</center>
     	<axis>
@@ -1291,15 +1285,15 @@
     	<object-name>n11</object-name>
     	<property>/engines/engine/n1</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>  0</dep></entry>
-			<entry><ind> 40</ind><dep> 47</dep></entry>
-			<entry><ind>100</ind><dep>174</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<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.00239</z-m>
+    		<z-m>0.00237</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1313,15 +1307,15 @@
     	<object-name>n12</object-name>
     	<property>/engines/engine[1]/n1</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>  0</dep></entry>
-			<entry><ind> 40</ind><dep> 47</dep></entry>
-			<entry><ind>100</ind><dep>174</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<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.0334</y-m>
-    		<z-m>0.00239</z-m>
+    		<y-m>0.0335</y-m>
+    		<z-m>0.00237</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
index d4531989..aabe09d5 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
+++ b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
@@ -3,9 +3,948 @@ MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 1 1 1  spec 0 0 0  shi 128
 MATERIAL "DefaultWhite.001" rgb 0 0 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 64  trans 0
 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647  spec 0 0 0  shi 0  trans 0
 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
 OBJECT poly
+name "egt2"
+loc 0.000492332 0.0384328 -0.0334988
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00562558 -0.000478942
+0 -0.00515015 -0.000478942
+0 -0.00515015 0.000477958
+0 0.00562558 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 "egt1"
+loc 0.000492332 0.0384328 0.0351023
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00562558 0.000477958
+0 -0.00515015 0.000477958
+0 -0.00515015 -0.000478942
+0 0.00562558 -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 "n12"
+loc 0.000492332 0.0671124 -0.0334988
+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 "n1limy2"
+loc 0.00028362 0.0748183 -0.0386329
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 0.000633299 0.00459962
+0 0.000608288 0.00373317
+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 "thrpos2"
+loc 0.000314596 0.0760098 -0.0334992
+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 "thrpos2"
+loc 0.000305618 0.0760098 -0.0334992
+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 "flap"
 loc 2.10118e-005 -0.0851298 -0.51126
 texture "eicasCFM-extra.png"
@@ -34,947 +973,15 @@ refs 4
 3 0.637093 0.368235
 kids 0
 OBJECT poly
-name "egt2"
-loc 0.000794735 0.027279 -0.0217698
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000367746 -0.00517167
-0 -0.00036741 -0.00513754
-0 -0.000206247 0.00516419
-0 0.00016132 0.00514711
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "egt1"
-loc 0.000794735 0.027279 0.0467833
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00016132 0.00514711
-0 -0.000206247 0.00516419
-0 -0.00036741 -0.00513754
-0 0.000367746 -0.00517167
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "n12"
-loc 0.000794735 0.0565868 -0.0269054
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00252993 0.00773323
-0 -0.00320914 0.00749853
-0 0.00215133 -0.00765085
-0 0.00356107 -0.00715187
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "n1limy2"
-loc 0.00028362 0.057454 -0.016538
-texture "yellow.png"
-crease 30.000002
-numvert 4
-0 -0.0045049 -0.00116534
-0 -0.00369225 -0.00086353
-0 -0.00417997 -0.00206228
-0 -0.00336739 -0.00176032
-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 "thrpos2"
-loc 0.000314596 0.053013 -0.0175935
-crease 45.000000
-numvert 61
-0 0 0
-0 -6.26519e-005 -0.000596091
-0 -0.000124622 -0.000586286
-0 -0.000185218 -0.000570036
-0 -0.000243787 -0.000547573
-0 -0.000299696 -0.000519082
-0 -0.000352304 -0.000484921
-0 -0.000401057 -0.00044544
-0 -0.000445426 -0.000401065
-0 -0.000484906 -0.000352308
-0 -0.000519078 -0.000299692
-0 -0.000547551 -0.000243783
-0 -0.00057004 -0.000185229
-0 -0.000586279 -0.000124618
-0 -0.000596087 -6.26594e-005
-0 -0.000599377 0
-0 -0.000596087 6.26594e-005
-0 -0.000586279 0.000124618
-0 -0.00057004 0.000185229
-0 -0.000547551 0.000243783
-0 -0.000519078 0.000299692
-0 -0.000484906 0.000352308
-0 -0.000445426 0.000401065
-0 -0.000401057 0.00044544
-0 -0.000352304 0.000484906
-0 -0.000299696 0.000519082
-0 -0.000243787 0.000547573
-0 -0.000185218 0.000570036
-0 -0.000124622 0.000586286
-0 -6.26519e-005 0.000596091
-0 0 0.000599384
-0 6.26519e-005 0.000596091
-0 0.000124622 0.000586286
-0 0.000185218 0.000570036
-0 0.000243787 0.000547573
-0 0.000299696 0.000519082
-0 0.000352304 0.000484906
-0 0.000401057 0.00044544
-0 0.000445426 0.000401065
-0 0.000484906 0.000352308
-0 0.000519078 0.000299692
-0 0.000547551 0.000243783
-0 0.00057004 0.000185229
-0 0.000586279 0.000124618
-0 0.000596087 6.26594e-005
-0 0.000599377 0
-0 0.000596087 -6.26594e-005
-0 0.000586279 -0.000124618
-0 0.00057004 -0.000185229
-0 0.000547551 -0.000243783
-0 0.000519078 -0.000299692
-0 0.000484906 -0.000352308
-0 0.000445426 -0.000401065
-0 0.000401057 -0.00044544
-0 0.000352304 -0.000484906
-0 0.000299696 -0.000519082
-0 0.000243787 -0.000547573
-0 0.000185218 -0.000570036
-0 0.000124622 -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 "thrpos2"
-loc 0.000305618 0.053013 -0.0175935
-crease 45.000000
-numvert 61
-0 0 -0.00094384
-0 9.86569e-005 -0.000938661
-0 0.000196241 -0.000923224
-0 0.000291657 -0.000897638
-0 0.000383895 -0.000862263
-0 0.000471924 -0.000817388
-0 0.000554774 -0.000763573
-0 0.000631552 -0.000701435
-0 0.000701401 -0.000631548
-0 0.00076358 -0.00055477
-0 0.000817392 -0.00047192
-0 0.00086223 -0.000383884
-0 0.000897642 -0.000291668
-0 0.00092322 -0.000196233
-0 0.000938661 -9.86606e-005
-0 0.00094384 0
-0 0.000938661 9.86606e-005
-0 0.00092322 0.000196233
-0 0.000897642 0.000291668
-0 0.00086223 0.000383884
-0 0.000817392 0.00047192
-0 0.00076358 0.00055477
-0 0.000701401 0.000631548
-0 0.000631552 0.000701435
-0 0.000554774 0.000763573
-0 0.000471924 0.000817388
-0 0.000383895 0.000862263
-0 0.000291657 0.000897638
-0 0.000196241 0.000923224
-0 9.86569e-005 0.000938661
-0 0 0.00094384
-0 -9.86569e-005 0.000938661
-0 -0.000196241 0.000923224
-0 -0.000291657 0.000897638
-0 -0.000383895 0.000862263
-0 -0.000471924 0.000817388
-0 -0.000554774 0.000763573
-0 -0.000631552 0.000701435
-0 -0.000701401 0.000631548
-0 -0.00076358 0.00055477
-0 -0.000817392 0.00047192
-0 -0.00086223 0.000383884
-0 -0.000897642 0.000291668
-0 -0.00092322 0.000196233
-0 -0.000938661 9.86606e-005
-0 -0.00094384 0
-0 -0.000938661 -9.86606e-005
-0 -0.00092322 -0.000196233
-0 -0.000897642 -0.000291668
-0 -0.00086223 -0.000383884
-0 -0.000817392 -0.00047192
-0 -0.00076358 -0.00055477
-0 -0.000701401 -0.000631548
-0 -0.000631552 -0.000701435
-0 -0.000554774 -0.000763595
-0 -0.000471924 -0.000817388
-0 -0.000383895 -0.000862263
-0 -0.000291657 -0.000897638
-0 -0.000196241 -0.000923224
-0 -9.86569e-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 "n1limy1"
-loc 0.00028362 0.057454 0.0520734
+loc 0.00028362 0.0748078 0.0299533
 texture "yellow.png"
 crease 30.000002
 numvert 4
-0 -0.00336739 -0.00176032
-0 -0.00417997 -0.00206228
-0 -0.00369225 -0.00086353
-0 -0.0045049 -0.00116534
+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
@@ -986,68 +993,68 @@ refs 4
 kids 0
 OBJECT poly
 name "thrpos1"
-loc 0.000314596 0.053013 0.0510179
+loc 0.000314596 0.0760098 0.035102
 crease 45.000000
 numvert 61
 0 0 -0.000599384
 0 6.26519e-005 -0.000596091
-0 0.000124622 -0.000586286
-0 0.000185218 -0.000570036
-0 0.000243787 -0.000547573
-0 0.000299696 -0.000519082
-0 0.000352304 -0.000484906
+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.000519078 -0.000299692
+0 0.000519082 -0.000299692
 0 0.000547551 -0.000243783
-0 0.00057004 -0.000185229
+0 0.000570044 -0.000185229
 0 0.000586279 -0.000124618
-0 0.000596087 -6.26594e-005
+0 0.000596091 -6.26594e-005
 0 0.000599377 0
-0 0.000596087 6.26594e-005
+0 0.000596091 6.26594e-005
 0 0.000586279 0.000124618
-0 0.00057004 0.000185229
+0 0.000570044 0.000185229
 0 0.000547551 0.000243783
-0 0.000519078 0.000299692
+0 0.000519082 0.000299692
 0 0.000484906 0.000352308
 0 0.000445426 0.000401065
 0 0.000401057 0.00044544
-0 0.000352304 0.000484906
-0 0.000299696 0.000519082
-0 0.000243787 0.000547573
-0 0.000185218 0.000570036
-0 0.000124622 0.000586286
+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.000124622 0.000586286
-0 -0.000185218 0.000570036
-0 -0.000243787 0.000547573
-0 -0.000299696 0.000519082
-0 -0.000352304 0.000484906
+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.000519078 0.000299692
+0 -0.000519082 0.000299692
 0 -0.000547551 0.000243783
-0 -0.00057004 0.000185229
+0 -0.000570044 0.000185229
 0 -0.000586279 0.000124618
-0 -0.000596087 6.26594e-005
+0 -0.000596091 6.26594e-005
 0 -0.000599377 0
-0 -0.000596087 -6.26594e-005
+0 -0.000596091 -6.26594e-005
 0 -0.000586279 -0.000124618
-0 -0.00057004 -0.000185229
+0 -0.000570044 -0.000185229
 0 -0.000547551 -0.000243783
-0 -0.000519078 -0.000299692
+0 -0.000519082 -0.000299692
 0 -0.000484906 -0.000352308
 0 -0.000445426 -0.000401065
 0 -0.000401057 -0.00044544
-0 -0.000352304 -0.000484921
-0 -0.000299696 -0.000519082
-0 -0.000243787 -0.000547573
-0 -0.000185218 -0.000570036
-0 -0.000124622 -0.000586286
+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
@@ -1414,69 +1421,69 @@ refs 3
 kids 0
 OBJECT poly
 name "thrpos1"
-loc 0.000305618 0.053013 0.0510179
+loc 0.000305618 0.0760098 0.035102
 crease 45.000000
 numvert 61
 0 0 0
-0 -9.86569e-005 -0.000938661
+0 -9.86606e-005 -0.000938661
 0 -0.000196241 -0.000923224
-0 -0.000291657 -0.000897638
-0 -0.000383895 -0.000862263
-0 -0.000471924 -0.000817388
-0 -0.000554774 -0.000763595
-0 -0.000631552 -0.000701435
-0 -0.000701401 -0.000631548
+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.000817392 -0.00047192
-0 -0.00086223 -0.000383884
-0 -0.000897642 -0.000291668
-0 -0.00092322 -0.000196233
+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.00092322 0.000196233
-0 -0.000897642 0.000291668
-0 -0.00086223 0.000383884
-0 -0.000817392 0.00047192
+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.000701401 0.000631548
-0 -0.000631552 0.000701435
-0 -0.000554774 0.000763573
-0 -0.000471924 0.000817388
-0 -0.000383895 0.000862263
-0 -0.000291657 0.000897638
+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.86569e-005 0.000938661
+0 -9.86606e-005 0.000938661
 0 0 0.00094384
-0 9.86569e-005 0.000938661
+0 9.86606e-005 0.000938661
 0 0.000196241 0.000923224
-0 0.000291657 0.000897638
-0 0.000383895 0.000862263
-0 0.000471924 0.000817388
-0 0.000554774 0.000763573
-0 0.000631552 0.000701435
-0 0.000701401 0.000631548
+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.000817392 0.00047192
-0 0.00086223 0.000383884
-0 0.000897642 0.000291668
-0 0.00092322 0.000196233
+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.00092322 -0.000196233
-0 0.000897642 -0.000291668
-0 0.00086223 -0.000383884
-0 0.000817392 -0.00047192
+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.000701401 -0.000631548
-0 0.000631552 -0.000701435
-0 0.000554774 -0.000763573
-0 0.000471924 -0.000817388
-0 0.000383895 -0.000862263
-0 0.000291657 -0.000897638
+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.86569e-005 -0.000938661
+0 9.86606e-005 -0.000938661
 0 0 -0.00094384
 numsurf 60
 SURF 0x30
@@ -1841,25 +1848,6 @@ refs 3
 0 0.5 0.5
 kids 0
 OBJECT poly
-name "n11"
-loc 0.000794735 0.0565868 0.0416832
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00356107 -0.00715186
-0 0.00215133 -0.00765084
-0 -0.00320914 0.00749853
-0 -0.00252993 0.00773323
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
 name "face"
 loc 1.66782e-005 -0.0851298 -0.51126
 texture "eicasCFM.png"
@@ -2065,3 +2053,24 @@ refs 4
 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
+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
+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
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/needle.png b/Models/Instruments/Upper-ECAM-EIS2/resCFM/needle.png
new file mode 100644
index 00000000..7eae21df
Binary files /dev/null and b/Models/Instruments/Upper-ECAM-EIS2/resCFM/needle.png differ
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
index 80329b81..15e66308 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
+++ b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
@@ -3,9 +3,990 @@ MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 1 1 1  spec 0 0 0  shi 128
 MATERIAL "DefaultWhite.001" rgb 0 0 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 64  trans 0
 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647  spec 0 0 0  shi 0  trans 0
 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
 OBJECT poly
+name "egt2"
+loc 0.000492332 0.0384328 -0.0334988
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00562558 -0.000478942
+0 -0.00515015 -0.000478942
+0 -0.00515015 0.000477958
+0 0.00562558 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 "egt1"
+loc 0.000492332 0.0384328 0.0351023
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.00562558 0.000477958
+0 -0.00515015 0.000477958
+0 -0.00515015 -0.000478942
+0 0.00562558 -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 "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
+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
+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 "epr2"
+loc 0.000492332 0.0671124 -0.0334988
+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 "eprlimy2"
+loc 0.00028362 0.0748183 -0.0386329
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 0.000633299 0.00459962
+0 0.000608288 0.00373317
+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 "thrpos2"
+loc 0.000314596 0.0760098 -0.0334992
+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 "thrpos2"
+loc 0.000305618 0.0760098 -0.0334992
+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 "flap"
 loc 2.10118e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
@@ -34,966 +1015,15 @@ refs 4
 3 0.637093 0.368235
 kids 0
 OBJECT poly
-name "egt2"
-loc 0.000794735 0.027279 -0.0217698
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000161324 0.00514711
-0 -0.00020624 0.00516419
-0 -0.000367407 -0.00513754
-0 0.000367753 -0.00517167
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "egt1"
-loc 0.000794735 0.027279 0.0467833
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000367753 -0.00517167
-0 -0.000367407 -0.00513754
-0 -0.00020624 0.00516419
-0 0.000161324 0.00514711
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "n12"
-loc 0.000794736 -0.000248273 -0.0255507
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00188643 0.00651396
-0 -0.00245427 0.00633497
-0 0.00156807 -0.00661433
-0 0.00270377 -0.0062563
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "epr2"
-loc 0.000794735 0.0565868 -0.0269054
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00252993 0.00773323
-0 -0.00320914 0.00749853
-0 0.00215133 -0.00765085
-0 0.00356107 -0.00715187
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "eprlimy2"
-loc 0.00028362 0.057454 -0.016538
-texture "yellow.png"
-crease 30.000002
-numvert 4
-0 -0.0045049 -0.00116534
-0 -0.00369225 -0.00086353
-0 -0.00417997 -0.00206228
-0 -0.00336739 -0.00176032
-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 "thrpos2"
-loc 0.000314596 0.053013 -0.0175935
-crease 45.000000
-numvert 61
-0 0 0
-0 -6.26519e-005 -0.000596091
-0 -0.000124622 -0.000586286
-0 -0.000185218 -0.000570036
-0 -0.000243787 -0.000547573
-0 -0.000299696 -0.000519082
-0 -0.000352304 -0.000484921
-0 -0.000401057 -0.00044544
-0 -0.000445426 -0.000401065
-0 -0.000484906 -0.000352308
-0 -0.000519078 -0.000299692
-0 -0.000547551 -0.000243783
-0 -0.00057004 -0.000185229
-0 -0.000586279 -0.000124618
-0 -0.000596087 -6.26594e-005
-0 -0.000599377 0
-0 -0.000596087 6.26594e-005
-0 -0.000586279 0.000124618
-0 -0.00057004 0.000185229
-0 -0.000547551 0.000243783
-0 -0.000519078 0.000299692
-0 -0.000484906 0.000352308
-0 -0.000445426 0.000401065
-0 -0.000401057 0.00044544
-0 -0.000352304 0.000484906
-0 -0.000299696 0.000519082
-0 -0.000243787 0.000547573
-0 -0.000185218 0.000570036
-0 -0.000124622 0.000586286
-0 -6.26519e-005 0.000596091
-0 0 0.000599384
-0 6.26519e-005 0.000596091
-0 0.000124622 0.000586286
-0 0.000185218 0.000570036
-0 0.000243787 0.000547573
-0 0.000299696 0.000519082
-0 0.000352304 0.000484906
-0 0.000401057 0.00044544
-0 0.000445426 0.000401065
-0 0.000484906 0.000352308
-0 0.000519078 0.000299692
-0 0.000547551 0.000243783
-0 0.00057004 0.000185229
-0 0.000586279 0.000124618
-0 0.000596087 6.26594e-005
-0 0.000599377 0
-0 0.000596087 -6.26594e-005
-0 0.000586279 -0.000124618
-0 0.00057004 -0.000185229
-0 0.000547551 -0.000243783
-0 0.000519078 -0.000299692
-0 0.000484906 -0.000352308
-0 0.000445426 -0.000401065
-0 0.000401057 -0.00044544
-0 0.000352304 -0.000484906
-0 0.000299696 -0.000519082
-0 0.000243787 -0.000547573
-0 0.000185218 -0.000570036
-0 0.000124622 -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 "thrpos2"
-loc 0.000305618 0.053013 -0.0175935
-crease 45.000000
-numvert 61
-0 0 -0.00094384
-0 9.86569e-005 -0.000938661
-0 0.000196241 -0.000923224
-0 0.000291657 -0.000897638
-0 0.000383895 -0.000862263
-0 0.000471924 -0.000817388
-0 0.000554774 -0.000763573
-0 0.000631552 -0.000701435
-0 0.000701401 -0.000631548
-0 0.00076358 -0.00055477
-0 0.000817392 -0.00047192
-0 0.00086223 -0.000383884
-0 0.000897642 -0.000291668
-0 0.00092322 -0.000196233
-0 0.000938661 -9.86606e-005
-0 0.00094384 0
-0 0.000938661 9.86606e-005
-0 0.00092322 0.000196233
-0 0.000897642 0.000291668
-0 0.00086223 0.000383884
-0 0.000817392 0.00047192
-0 0.00076358 0.00055477
-0 0.000701401 0.000631548
-0 0.000631552 0.000701435
-0 0.000554774 0.000763573
-0 0.000471924 0.000817388
-0 0.000383895 0.000862263
-0 0.000291657 0.000897638
-0 0.000196241 0.000923224
-0 9.86569e-005 0.000938661
-0 0 0.00094384
-0 -9.86569e-005 0.000938661
-0 -0.000196241 0.000923224
-0 -0.000291657 0.000897638
-0 -0.000383895 0.000862263
-0 -0.000471924 0.000817388
-0 -0.000554774 0.000763573
-0 -0.000631552 0.000701435
-0 -0.000701401 0.000631548
-0 -0.00076358 0.00055477
-0 -0.000817392 0.00047192
-0 -0.00086223 0.000383884
-0 -0.000897642 0.000291668
-0 -0.00092322 0.000196233
-0 -0.000938661 9.86606e-005
-0 -0.00094384 0
-0 -0.000938661 -9.86606e-005
-0 -0.00092322 -0.000196233
-0 -0.000897642 -0.000291668
-0 -0.00086223 -0.000383884
-0 -0.000817392 -0.00047192
-0 -0.00076358 -0.00055477
-0 -0.000701401 -0.000631548
-0 -0.000631552 -0.000701435
-0 -0.000554774 -0.000763595
-0 -0.000471924 -0.000817388
-0 -0.000383895 -0.000862263
-0 -0.000291657 -0.000897638
-0 -0.000196241 -0.000923224
-0 -9.86569e-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 "eprlimy1"
-loc 0.00028362 0.057454 0.0520734
+loc 0.00028362 0.0748078 0.0299533
 texture "yellow.png"
 crease 30.000002
 numvert 4
-0 -0.00336739 -0.00176032
-0 -0.00417997 -0.00206228
-0 -0.00369225 -0.00086353
-0 -0.0045049 -0.00116534
+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
@@ -1005,68 +1035,68 @@ refs 4
 kids 0
 OBJECT poly
 name "thrpos1"
-loc 0.000314596 0.053013 0.0510179
+loc 0.000314596 0.0760098 0.035102
 crease 45.000000
 numvert 61
 0 0 -0.000599384
 0 6.26519e-005 -0.000596091
-0 0.000124622 -0.000586286
-0 0.000185218 -0.000570036
-0 0.000243787 -0.000547573
-0 0.000299696 -0.000519082
-0 0.000352304 -0.000484906
+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.000519078 -0.000299692
+0 0.000519082 -0.000299692
 0 0.000547551 -0.000243783
-0 0.00057004 -0.000185229
+0 0.000570044 -0.000185229
 0 0.000586279 -0.000124618
-0 0.000596087 -6.26594e-005
+0 0.000596091 -6.26594e-005
 0 0.000599377 0
-0 0.000596087 6.26594e-005
+0 0.000596091 6.26594e-005
 0 0.000586279 0.000124618
-0 0.00057004 0.000185229
+0 0.000570044 0.000185229
 0 0.000547551 0.000243783
-0 0.000519078 0.000299692
+0 0.000519082 0.000299692
 0 0.000484906 0.000352308
 0 0.000445426 0.000401065
 0 0.000401057 0.00044544
-0 0.000352304 0.000484906
-0 0.000299696 0.000519082
-0 0.000243787 0.000547573
-0 0.000185218 0.000570036
-0 0.000124622 0.000586286
+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.000124622 0.000586286
-0 -0.000185218 0.000570036
-0 -0.000243787 0.000547573
-0 -0.000299696 0.000519082
-0 -0.000352304 0.000484906
+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.000519078 0.000299692
+0 -0.000519082 0.000299692
 0 -0.000547551 0.000243783
-0 -0.00057004 0.000185229
+0 -0.000570044 0.000185229
 0 -0.000586279 0.000124618
-0 -0.000596087 6.26594e-005
+0 -0.000596091 6.26594e-005
 0 -0.000599377 0
-0 -0.000596087 -6.26594e-005
+0 -0.000596091 -6.26594e-005
 0 -0.000586279 -0.000124618
-0 -0.00057004 -0.000185229
+0 -0.000570044 -0.000185229
 0 -0.000547551 -0.000243783
-0 -0.000519078 -0.000299692
+0 -0.000519082 -0.000299692
 0 -0.000484906 -0.000352308
 0 -0.000445426 -0.000401065
 0 -0.000401057 -0.00044544
-0 -0.000352304 -0.000484921
-0 -0.000299696 -0.000519082
-0 -0.000243787 -0.000547573
-0 -0.000185218 -0.000570036
-0 -0.000124622 -0.000586286
+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
@@ -1433,69 +1463,69 @@ refs 3
 kids 0
 OBJECT poly
 name "thrpos1"
-loc 0.000305618 0.053013 0.0510179
+loc 0.000305618 0.0760098 0.035102
 crease 45.000000
 numvert 61
 0 0 0
-0 -9.86569e-005 -0.000938661
+0 -9.86606e-005 -0.000938661
 0 -0.000196241 -0.000923224
-0 -0.000291657 -0.000897638
-0 -0.000383895 -0.000862263
-0 -0.000471924 -0.000817388
-0 -0.000554774 -0.000763595
-0 -0.000631552 -0.000701435
-0 -0.000701401 -0.000631548
+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.000817392 -0.00047192
-0 -0.00086223 -0.000383884
-0 -0.000897642 -0.000291668
-0 -0.00092322 -0.000196233
+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.00092322 0.000196233
-0 -0.000897642 0.000291668
-0 -0.00086223 0.000383884
-0 -0.000817392 0.00047192
+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.000701401 0.000631548
-0 -0.000631552 0.000701435
-0 -0.000554774 0.000763573
-0 -0.000471924 0.000817388
-0 -0.000383895 0.000862263
-0 -0.000291657 0.000897638
+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.86569e-005 0.000938661
+0 -9.86606e-005 0.000938661
 0 0 0.00094384
-0 9.86569e-005 0.000938661
+0 9.86606e-005 0.000938661
 0 0.000196241 0.000923224
-0 0.000291657 0.000897638
-0 0.000383895 0.000862263
-0 0.000471924 0.000817388
-0 0.000554774 0.000763573
-0 0.000631552 0.000701435
-0 0.000701401 0.000631548
+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.000817392 0.00047192
-0 0.00086223 0.000383884
-0 0.000897642 0.000291668
-0 0.00092322 0.000196233
+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.00092322 -0.000196233
-0 0.000897642 -0.000291668
-0 0.00086223 -0.000383884
-0 0.000817392 -0.00047192
+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.000701401 -0.000631548
-0 0.000631552 -0.000701435
-0 0.000554774 -0.000763573
-0 0.000471924 -0.000817388
-0 0.000383895 -0.000862263
-0 0.000291657 -0.000897638
+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.86569e-005 -0.000938661
+0 9.86606e-005 -0.000938661
 0 0 -0.00094384
 numsurf 60
 SURF 0x30
@@ -1860,44 +1890,6 @@ refs 3
 0 0.5 0.5
 kids 0
 OBJECT poly
-name "n11"
-loc 0.000794736 -0.000248273 0.0430787
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00270377 -0.0062563
-0 0.00156807 -0.00661432
-0 -0.00245427 0.00633497
-0 -0.00188643 0.00651396
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "epr1"
-loc 0.000794735 0.0563719 0.0422057
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00377597 -0.00767436
-0 0.00236623 -0.00817334
-0 -0.00299424 0.00697603
-0 -0.00231503 0.00721074
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
 name "face"
 loc 1.66782e-005 -0.0851298 -0.51126
 texture "eicasIAE.png"
@@ -2150,3 +2142,24 @@ refs 4
 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
+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
+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
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resIAE/needle.png b/Models/Instruments/Upper-ECAM-EIS2/resIAE/needle.png
new file mode 100644
index 00000000..7eae21df
Binary files /dev/null and b/Models/Instruments/Upper-ECAM-EIS2/resIAE/needle.png differ
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
index 04aba019..db2d4836 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml
@@ -897,16 +897,16 @@
     	<object-name>n11</object-name>
     	<property>/engines/engine/n1</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep> -3</dep></entry>
-			<entry><ind> 22</ind><dep> -3</dep></entry>
-			<entry><ind> 50</ind><dep> 72</dep></entry>
-			<entry><ind>100</ind><dep>178</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<entry><ind>  0.0</ind><dep>-116</dep></entry>
+			<entry><ind> 22.4</ind><dep>-116</dep></entry>
+			<entry><ind> 50.0</ind><dep> -39</dep></entry>
+			<entry><ind>100.0</ind><dep>  69</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.0579</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.05793</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -920,16 +920,16 @@
     	<object-name>n12</object-name>
     	<property>/engines/engine[1]/n1</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep> -3</dep></entry>
-			<entry><ind> 22</ind><dep> -3</dep></entry>
-			<entry><ind> 50</ind><dep> 72</dep></entry>
-			<entry><ind>100</ind><dep>178</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<entry><ind>  0.0</ind><dep>-116</dep></entry>
+			<entry><ind> 22.4</ind><dep>-116</dep></entry>
+			<entry><ind> 50.0</ind><dep> -39</dep></entry>
+			<entry><ind>100.0</ind><dep>  69</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.0579</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.05793</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -943,16 +943,16 @@
     	<object-name>n1limy1</object-name>
     	<property>/controls/engines/n1-limit</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep> -3</dep></entry>
-			<entry><ind> 22</ind><dep> -3</dep></entry>
-			<entry><ind> 50</ind><dep> 72</dep></entry>
-			<entry><ind>100</ind><dep>178</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<entry><ind>  0.0</ind><dep>-116</dep></entry>
+			<entry><ind> 22.4</ind><dep>-116</dep></entry>
+			<entry><ind> 50.0</ind><dep> -39</dep></entry>
+			<entry><ind>100.0</ind><dep>  69</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.0579</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.05793</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -966,16 +966,16 @@
     	<object-name>n1limy2</object-name>
     	<property>/controls/engines/n1-limit</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep> -3</dep></entry>
-			<entry><ind> 22</ind><dep> -3</dep></entry>
-			<entry><ind> 50</ind><dep> 72</dep></entry>
-			<entry><ind>100</ind><dep>178</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<entry><ind>  0.0</ind><dep>-116</dep></entry>
+			<entry><ind> 22.4</ind><dep>-116</dep></entry>
+			<entry><ind> 50.0</ind><dep> -39</dep></entry>
+			<entry><ind>100.0</ind><dep>  69</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.0579</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.05793</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -989,16 +989,16 @@
     	<object-name>thrpos1</object-name>
     	<property>/engines/engine[0]/n1-cmd</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep> -3</dep></entry>
-			<entry><ind> 22</ind><dep> -3</dep></entry>
-			<entry><ind> 50</ind><dep> 72</dep></entry>
-			<entry><ind>100</ind><dep>178</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<entry><ind>  0.0</ind><dep>-116</dep></entry>
+			<entry><ind> 22.4</ind><dep>-116</dep></entry>
+			<entry><ind> 50.0</ind><dep> -39</dep></entry>
+			<entry><ind>100.0</ind><dep>  69</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.0579</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.05793</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1012,16 +1012,16 @@
     	<object-name>thrpos2</object-name>
     	<property>/engines/engine[1]/n1-cmd</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep> -3</dep></entry>
-			<entry><ind> 22</ind><dep> -3</dep></entry>
-			<entry><ind> 50</ind><dep> 72</dep></entry>
-			<entry><ind>100</ind><dep>178</dep></entry>
-			<entry><ind>110</ind><dep>195</dep></entry>
+			<entry><ind>  0.0</ind><dep>-116</dep></entry>
+			<entry><ind> 22.4</ind><dep>-116</dep></entry>
+			<entry><ind> 50.0</ind><dep> -39</dep></entry>
+			<entry><ind>100.0</ind><dep>  69</dep></entry>
+			<entry><ind>110.0</ind><dep>  90</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.0579</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.05793</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1037,14 +1037,14 @@
     	<object-name>egt1</object-name>
     	<property>/engines/engine/egt-actual</property>
 		<interpolation>
-			<entry><ind>   0</ind><dep>  3</dep></entry>
-			<entry><ind> 500</ind><dep> 76</dep></entry>
-			<entry><ind>1000</ind><dep>160</dep></entry>
+			<entry><ind>   0</ind><dep>-107</dep></entry>
+			<entry><ind> 500</ind><dep> -34</dep></entry>
+			<entry><ind>1000</ind><dep>  51</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.0265</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.02667</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1058,14 +1058,14 @@
     	<object-name>egt2</object-name>
     	<property>/engines/engine[1]/egt-actual</property>
 		<interpolation>
-			<entry><ind>   0</ind><dep>  3</dep></entry>
-			<entry><ind> 500</ind><dep> 76</dep></entry>
-			<entry><ind>1000</ind><dep>160</dep></entry>
+			<entry><ind>   0</ind><dep>-107</dep></entry>
+			<entry><ind> 500</ind><dep> -34</dep></entry>
+			<entry><ind>1000</ind><dep>  51</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.0265</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.02667</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
index 702c83da..3ba53acd 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
@@ -723,7 +723,7 @@
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0580</y-m>
-			<z-m>-0.001</z-m>
+			<z-m>-0.002</z-m>
 		</offsets>
 		<alignment>center-center</alignment>
 		<axis-alignment>yz-plane</axis-alignment>
@@ -747,7 +747,7 @@
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0025</y-m>
-			<z-m>-0.001</z-m>
+			<z-m>-0.002</z-m>
 		</offsets>
 		<alignment>center-center</alignment>
 		<axis-alignment>yz-plane</axis-alignment>
@@ -771,7 +771,7 @@
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0580</y-m>
-			<z-m>-0.001</z-m>
+			<z-m>-0.002</z-m>
 		</offsets>
 		<alignment>center-center</alignment>
 		<axis-alignment>yz-plane</axis-alignment>
@@ -795,7 +795,7 @@
 		<offsets>
 			<x-m>0.0004</x-m>
 			<y-m>-0.0025</y-m>
-			<z-m>-0.001</z-m>
+			<z-m>-0.002</z-m>
 		</offsets>
 		<alignment>center-center</alignment>
 		<axis-alignment>yz-plane</axis-alignment>
@@ -1095,18 +1095,17 @@
     	<object-name>epr1</object-name>
     	<property>/engines/engine/epr-actual</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep> -4</dep></entry>
-			<entry><ind>1.000</ind><dep> 04</dep></entry>
-			<entry><ind>1.100</ind><dep> 33</dep></entry>
-			<entry><ind>1.200</ind><dep> 64</dep></entry>
-			<entry><ind>1.400</ind><dep>124</dep></entry>
-			<entry><ind>1.600</ind><dep>177</dep></entry>
-			<entry><ind>1.650</ind><dep>191</dep></entry>
+			<entry><ind>0.990</ind><dep>-113</dep></entry>
+			<entry><ind>1.000</ind><dep>-105</dep></entry>
+			<entry><ind>1.200</ind><dep> -45</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  67</dep></entry>
+			<entry><ind>1.650</ind><dep>  81</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.06029</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.06028</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1120,18 +1119,17 @@
     	<object-name>epr2</object-name>
     	<property>/engines/engine[1]/epr-actual</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep> -4</dep></entry>
-			<entry><ind>1.000</ind><dep> 04</dep></entry>
-			<entry><ind>1.100</ind><dep> 33</dep></entry>
-			<entry><ind>1.200</ind><dep> 64</dep></entry>
-			<entry><ind>1.400</ind><dep>124</dep></entry>
-			<entry><ind>1.600</ind><dep>177</dep></entry>
-			<entry><ind>1.650</ind><dep>191</dep></entry>
+			<entry><ind>0.990</ind><dep>-113</dep></entry>
+			<entry><ind>1.000</ind><dep>-105</dep></entry>
+			<entry><ind>1.200</ind><dep> -45</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  67</dep></entry>
+			<entry><ind>1.650</ind><dep>  81</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.06029</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.06028</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1145,18 +1143,17 @@
     	<object-name>eprlimy1</object-name>
     	<property>/controls/engines/epr-limit</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep> -4</dep></entry>
-			<entry><ind>1.000</ind><dep> 04</dep></entry>
-			<entry><ind>1.100</ind><dep> 33</dep></entry>
-			<entry><ind>1.200</ind><dep> 64</dep></entry>
-			<entry><ind>1.400</ind><dep>124</dep></entry>
-			<entry><ind>1.600</ind><dep>177</dep></entry>
-			<entry><ind>1.650</ind><dep>191</dep></entry>
+			<entry><ind>0.990</ind><dep>-113</dep></entry>
+			<entry><ind>1.000</ind><dep>-105</dep></entry>
+			<entry><ind>1.200</ind><dep> -45</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  67</dep></entry>
+			<entry><ind>1.650</ind><dep>  81</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.06029</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.06028</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1170,18 +1167,17 @@
     	<object-name>eprlimy2</object-name>
     	<property>/controls/engines/epr-limit</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep> -4</dep></entry>
-			<entry><ind>1.000</ind><dep> 04</dep></entry>
-			<entry><ind>1.100</ind><dep> 33</dep></entry>
-			<entry><ind>1.200</ind><dep> 64</dep></entry>
-			<entry><ind>1.400</ind><dep>124</dep></entry>
-			<entry><ind>1.600</ind><dep>177</dep></entry>
-			<entry><ind>1.650</ind><dep>191</dep></entry>
+			<entry><ind>0.990</ind><dep>-113</dep></entry>
+			<entry><ind>1.000</ind><dep>-105</dep></entry>
+			<entry><ind>1.200</ind><dep> -45</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  67</dep></entry>
+			<entry><ind>1.650</ind><dep>  81</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.06029</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.06028</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1195,18 +1191,17 @@
     	<object-name>thrpos1</object-name>
     	<property>/engines/engine[0]/epr-cmd</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep> -4</dep></entry>
-			<entry><ind>1.000</ind><dep> 04</dep></entry>
-			<entry><ind>1.100</ind><dep> 33</dep></entry>
-			<entry><ind>1.200</ind><dep> 64</dep></entry>
-			<entry><ind>1.400</ind><dep>124</dep></entry>
-			<entry><ind>1.600</ind><dep>177</dep></entry>
-			<entry><ind>1.650</ind><dep>191</dep></entry>
+			<entry><ind>0.990</ind><dep>-113</dep></entry>
+			<entry><ind>1.000</ind><dep>-105</dep></entry>
+			<entry><ind>1.200</ind><dep> -45</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  67</dep></entry>
+			<entry><ind>1.650</ind><dep>  81</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.06029</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.06028</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1220,18 +1215,17 @@
     	<object-name>thrpos2</object-name>
     	<property>/engines/engine[1]/epr-cmd</property>
 		<interpolation>
-			<entry><ind>0.985</ind><dep> -4</dep></entry>
-			<entry><ind>1.000</ind><dep> 04</dep></entry>
-			<entry><ind>1.100</ind><dep> 33</dep></entry>
-			<entry><ind>1.200</ind><dep> 64</dep></entry>
-			<entry><ind>1.400</ind><dep>124</dep></entry>
-			<entry><ind>1.600</ind><dep>177</dep></entry>
-			<entry><ind>1.650</ind><dep>191</dep></entry>
+			<entry><ind>0.990</ind><dep>-113</dep></entry>
+			<entry><ind>1.000</ind><dep>-105</dep></entry>
+			<entry><ind>1.200</ind><dep> -45</dep></entry>
+			<entry><ind>1.400</ind><dep>  15</dep></entry>
+			<entry><ind>1.600</ind><dep>  67</dep></entry>
+			<entry><ind>1.650</ind><dep>  81</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.06029</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.06028</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1247,14 +1241,14 @@
     	<object-name>egt1</object-name>
     	<property>/engines/engine/egt-actual</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep>  0</dep></entry>
-			<entry><ind>400</ind><dep> 78</dep></entry>
-			<entry><ind>800</ind><dep>160</dep></entry>
+			<entry><ind>  0</ind><dep>-107</dep></entry>
+			<entry><ind>400</ind><dep> -29</dep></entry>
+			<entry><ind>800</ind><dep>  51</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0598</y-m>
-    		<z-m>0.0319</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.03176</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1268,14 +1262,14 @@
     	<object-name>egt2</object-name>
     	<property>/engines/engine[1]/egt-actual</property>
 		<interpolation>
-			<entry><ind>  0</ind><dep>  0</dep></entry>
-			<entry><ind>400</ind><dep> 78</dep></entry>
-			<entry><ind>800</ind><dep>160</dep></entry>
+			<entry><ind>  0</ind><dep>-107</dep></entry>
+			<entry><ind>400</ind><dep> -29</dep></entry>
+			<entry><ind>800</ind><dep>  51</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
-    		<y-m>-0.0042</y-m>
-    		<z-m>0.0319</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.03176</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1291,15 +1285,15 @@
     	<object-name>n11</object-name>
     	<property>/engines/engine/n1</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>  0</dep></entry>
-			<entry><ind> 40</ind><dep> 47</dep></entry>
-			<entry><ind>100</ind><dep>159</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<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.0598</y-m>
-    		<z-m>0.00205</z-m>
+    		<y-m>-0.05978</y-m>
+    		<z-m>0.00187</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
@@ -1313,15 +1307,15 @@
     	<object-name>n12</object-name>
     	<property>/engines/engine[1]/n1</property>
 		<interpolation>
-			<entry><ind> 22</ind><dep>  0</dep></entry>
-			<entry><ind> 40</ind><dep> 47</dep></entry>
-			<entry><ind>100</ind><dep>159</dep></entry>
-			<entry><ind>110</ind><dep>170</dep></entry>
+			<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.0042</y-m>
-    		<z-m>0.00205</z-m>
+    		<y-m>-0.00417</y-m>
+    		<z-m>0.00187</z-m>
     	</center>
     	<axis>
     		<x>-1</x>
diff --git a/Models/Instruments/Upper-ECAM/resCFM/eicasCFM-extra.png b/Models/Instruments/Upper-ECAM/resCFM/eicasCFM-extra.png
index 4a801c6b..abe33434 100644
Binary files a/Models/Instruments/Upper-ECAM/resCFM/eicasCFM-extra.png and b/Models/Instruments/Upper-ECAM/resCFM/eicasCFM-extra.png differ
diff --git a/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac b/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac
index 17454a62..ab0ed866 100644
--- a/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac
+++ b/Models/Instruments/Upper-ECAM/resCFM/eicasCFM.ac
@@ -3,37 +3,19 @@ MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 1 1 1  spec 0 0 0  shi 128
 MATERIAL "DefaultWhite.001" rgb 0 0 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 64  trans 0
 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647  spec 0 0 0  shi 0  trans 0
 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
 OBJECT poly
-name "egt2"
-loc 0.000794735 0.0234148 0.0118747
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00312056 -0.00611024
-0 0.00199804 -0.00650768
-0 -0.00247378 0.00629334
-0 -0.00191253 0.00649205
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
 name "n1limy2"
-loc 0.00028362 0.0564652 0.0211547
+loc 0.00028362 0.0737064 -0.00098132
 texture "yellow.png"
 crease 30.000002
 numvert 4
-0 -0.0045049 -0.00116534
-0 -0.00369225 -0.00086353
-0 -0.00417997 -0.00206228
-0 -0.00336739 -0.00176032
+0 0.000633299 0.00459963
+0 0.00060828 0.00373316
+0 -0.000956118 0.00466734
+0 -0.000980854 0.00380089
 numsurf 1
 SURF 0x20
 mat 3
@@ -45,69 +27,69 @@ refs 4
 kids 0
 OBJECT poly
 name "thrpos2"
-loc 0.000314596 0.0520242 0.0200992
+loc 0.000314596 0.0749085 0.00416738
 crease 45.000000
 numvert 61
 0 0 0
-0 -6.26519e-005 -0.000596091
-0 -0.000124622 -0.000586286
-0 -0.000185218 -0.000570036
-0 -0.000243787 -0.000547573
-0 -0.000299696 -0.000519082
-0 -0.000352304 -0.000484921
-0 -0.000401057 -0.00044544
+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.000484921
+0 -0.000401065 -0.00044544
 0 -0.000445426 -0.000401065
-0 -0.000484906 -0.000352308
-0 -0.000519078 -0.000299692
-0 -0.000547551 -0.000243783
-0 -0.00057004 -0.000185229
-0 -0.000586279 -0.000124618
-0 -0.000596087 -6.26594e-005
-0 -0.000599377 0
-0 -0.000596087 6.26594e-005
-0 -0.000586279 0.000124618
-0 -0.00057004 0.000185229
-0 -0.000547551 0.000243783
-0 -0.000519078 0.000299692
-0 -0.000484906 0.000352308
+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.000401057 0.00044544
-0 -0.000352304 0.000484906
-0 -0.000299696 0.000519082
-0 -0.000243787 0.000547573
-0 -0.000185218 0.000570036
-0 -0.000124622 0.000586286
-0 -6.26519e-005 0.000596091
+0 -0.000401065 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.26594e-005 0.000596091
 0 0 0.000599384
-0 6.26519e-005 0.000596091
-0 0.000124622 0.000586286
-0 0.000185218 0.000570036
-0 0.000243787 0.000547573
-0 0.000299696 0.000519082
-0 0.000352304 0.000484906
-0 0.000401057 0.00044544
+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.000484906 0.000352308
-0 0.000519078 0.000299692
-0 0.000547551 0.000243783
-0 0.00057004 0.000185229
-0 0.000586279 0.000124618
-0 0.000596087 6.26594e-005
-0 0.000599377 0
-0 0.000596087 -6.26594e-005
-0 0.000586279 -0.000124618
-0 0.00057004 -0.000185229
-0 0.000547551 -0.000243783
-0 0.000519078 -0.000299692
-0 0.000484906 -0.000352308
+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.000401057 -0.00044544
-0 0.000352304 -0.000484906
-0 0.000299696 -0.000519082
-0 0.000243787 -0.000547573
-0 0.000185218 -0.000570036
-0 0.000124622 -0.000586286
-0 6.26519e-005 -0.000596091
+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
 numsurf 60
 SURF 0x30
@@ -473,69 +455,69 @@ refs 3
 kids 0
 OBJECT poly
 name "thrpos2"
-loc 0.000305618 0.0520242 0.0200992
+loc 0.000305618 0.0749085 0.00416738
 crease 45.000000
 numvert 61
 0 0 -0.00094384
-0 9.86569e-005 -0.000938661
-0 0.000196241 -0.000923224
-0 0.000291657 -0.000897638
-0 0.000383895 -0.000862263
-0 0.000471924 -0.000817388
-0 0.000554774 -0.000763573
-0 0.000631552 -0.000701435
-0 0.000701401 -0.000631548
+0 9.86606e-005 -0.000938662
+0 0.000196233 -0.000923224
+0 0.00029166 -0.000897639
+0 0.000383899 -0.000862264
+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.000817392 -0.00047192
-0 0.00086223 -0.000383884
-0 0.000897642 -0.000291668
-0 0.00092322 -0.000196233
-0 0.000938661 -9.86606e-005
+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.000938661 9.86606e-005
-0 0.00092322 0.000196233
-0 0.000897642 0.000291668
-0 0.00086223 0.000383884
-0 0.000817392 0.00047192
+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.000701401 0.000631548
-0 0.000631552 0.000701435
-0 0.000554774 0.000763573
-0 0.000471924 0.000817388
-0 0.000383895 0.000862263
-0 0.000291657 0.000897638
-0 0.000196241 0.000923224
-0 9.86569e-005 0.000938661
+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
-0 -9.86569e-005 0.000938661
-0 -0.000196241 0.000923224
-0 -0.000291657 0.000897638
-0 -0.000383895 0.000862263
-0 -0.000471924 0.000817388
-0 -0.000554774 0.000763573
-0 -0.000631552 0.000701435
-0 -0.000701401 0.000631548
+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.000763573
+0 -0.000631556 0.000701435
+0 -0.000701398 0.000631548
 0 -0.00076358 0.00055477
-0 -0.000817392 0.00047192
-0 -0.00086223 0.000383884
-0 -0.000897642 0.000291668
-0 -0.00092322 0.000196233
-0 -0.000938661 9.86606e-005
+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.000938661 -9.86606e-005
-0 -0.00092322 -0.000196233
-0 -0.000897642 -0.000291668
-0 -0.00086223 -0.000383884
-0 -0.000817392 -0.00047192
+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.000701401 -0.000631548
-0 -0.000631552 -0.000701435
-0 -0.000554774 -0.000763595
-0 -0.000471924 -0.000817388
-0 -0.000383895 -0.000862263
-0 -0.000291657 -0.000897638
-0 -0.000196241 -0.000923224
-0 -9.86569e-005 -0.000938661
+0 -0.000701398 -0.000631548
+0 -0.000631556 -0.000701435
+0 -0.00055477 -0.000763595
+0 -0.00047192 -0.000817388
+0 -0.000383899 -0.000862264
+0 -0.00029166 -0.000897639
+0 -0.000196248 -0.000923224
+0 -9.86606e-005 -0.000938662
 0 0 0
 numsurf 60
 SURF 0x30
@@ -901,33 +883,35 @@ refs 3
 kids 0
 OBJECT poly
 name "n12"
-loc 0.000794735 0.0553275 0.0113036
-texture "symbols.png"
-crease 45.000000
+loc 0.000492332 0.066011 0.00416768
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
 numvert 4
-0 -0.00232298 0.00720663
-0 -0.0029401 0.00698441
-0 0.00197697 -0.00733124
-0 0.00321126 -0.00688677
+0 0.00935113 -0.000478942
+0 -0.00856084 -0.000478942
+0 -0.00856084 0.000477958
+0 0.00935113 0.000477958
 numsurf 1
-SURF 0x30
-mat 0
+SURF 0x0
+mat 4
 refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
+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 "n1limy1"
-loc 0.00028362 0.0564652 0.0767808
+loc 0.00028362 0.0737064 0.0546341
 texture "yellow.png"
 crease 30.000002
 numvert 4
-0 -0.00336739 -0.00176032
-0 -0.00417997 -0.00206228
-0 -0.00369225 -0.00086353
-0 -0.0045049 -0.00116534
+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
@@ -938,89 +922,70 @@ refs 4
 1 0 0
 kids 0
 OBJECT poly
-name "flapc"
-loc 0.000794735 0.00884851 -0.0438111
-texture "grey.png"
-crease 45.000000
-numvert 4
-0 0.00185478 0.00414005
-0 0.00185478 -0.00406742
-0 -0.00185479 -0.00219462
-0 -0.00185479 0.00246911
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.726161 0.346401
-2 0.702121 0.346401
-1 0.687308 0.324581
-0 0.742187 0.324581
-kids 0
-OBJECT poly
 name "thrpos1"
-loc 0.000314596 0.0520242 0.0757253
+loc 0.000314596 0.0749085 0.0597828
 crease 45.000000
 numvert 61
 0 0 -0.000599384
-0 6.26519e-005 -0.000596091
-0 0.000124622 -0.000586286
-0 0.000185218 -0.000570036
-0 0.000243787 -0.000547573
-0 0.000299696 -0.000519082
-0 0.000352304 -0.000484906
-0 0.000401057 -0.00044544
+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.000484906 -0.000352308
-0 0.000519078 -0.000299692
-0 0.000547551 -0.000243783
-0 0.00057004 -0.000185229
-0 0.000586279 -0.000124618
-0 0.000596087 -6.26594e-005
-0 0.000599377 0
-0 0.000596087 6.26594e-005
-0 0.000586279 0.000124618
-0 0.00057004 0.000185229
-0 0.000547551 0.000243783
-0 0.000519078 0.000299692
-0 0.000484906 0.000352308
+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.000401057 0.00044544
-0 0.000352304 0.000484906
-0 0.000299696 0.000519082
-0 0.000243787 0.000547573
-0 0.000185218 0.000570036
-0 0.000124622 0.000586286
-0 6.26519e-005 0.000596091
+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.26519e-005 0.000596091
-0 -0.000124622 0.000586286
-0 -0.000185218 0.000570036
-0 -0.000243787 0.000547573
-0 -0.000299696 0.000519082
-0 -0.000352304 0.000484906
-0 -0.000401057 0.00044544
+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.000484906 0.000352308
-0 -0.000519078 0.000299692
-0 -0.000547551 0.000243783
-0 -0.00057004 0.000185229
-0 -0.000586279 0.000124618
-0 -0.000596087 6.26594e-005
-0 -0.000599377 0
-0 -0.000596087 -6.26594e-005
-0 -0.000586279 -0.000124618
-0 -0.00057004 -0.000185229
-0 -0.000547551 -0.000243783
-0 -0.000519078 -0.000299692
-0 -0.000484906 -0.000352308
+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.000401057 -0.00044544
-0 -0.000352304 -0.000484921
-0 -0.000299696 -0.000519082
-0 -0.000243787 -0.000547573
-0 -0.000185218 -0.000570036
-0 -0.000124622 -0.000586286
-0 -6.26519e-005 -0.000596091
+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
@@ -1386,69 +1351,69 @@ refs 3
 kids 0
 OBJECT poly
 name "thrpos1"
-loc 0.000305618 0.0520242 0.0757253
+loc 0.000305618 0.0749085 0.0597828
 crease 45.000000
 numvert 61
 0 0 0
-0 -9.86569e-005 -0.000938661
-0 -0.000196241 -0.000923224
-0 -0.000291657 -0.000897638
-0 -0.000383895 -0.000862263
-0 -0.000471924 -0.000817388
-0 -0.000554774 -0.000763595
-0 -0.000631552 -0.000701435
-0 -0.000701401 -0.000631548
+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.000817392 -0.00047192
-0 -0.00086223 -0.000383884
-0 -0.000897642 -0.000291668
-0 -0.00092322 -0.000196233
-0 -0.000938661 -9.86606e-005
+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.000938661 9.86606e-005
-0 -0.00092322 0.000196233
-0 -0.000897642 0.000291668
-0 -0.00086223 0.000383884
-0 -0.000817392 0.00047192
+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.000701401 0.000631548
-0 -0.000631552 0.000701435
-0 -0.000554774 0.000763573
-0 -0.000471924 0.000817388
-0 -0.000383895 0.000862263
-0 -0.000291657 0.000897638
-0 -0.000196241 0.000923224
-0 -9.86569e-005 0.000938661
+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.86569e-005 0.000938661
-0 0.000196241 0.000923224
-0 0.000291657 0.000897638
-0 0.000383895 0.000862263
-0 0.000471924 0.000817388
-0 0.000554774 0.000763573
-0 0.000631552 0.000701435
-0 0.000701401 0.000631548
+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.000817392 0.00047192
-0 0.00086223 0.000383884
-0 0.000897642 0.000291668
-0 0.00092322 0.000196233
-0 0.000938661 9.86606e-005
+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.000938661 -9.86606e-005
-0 0.00092322 -0.000196233
-0 0.000897642 -0.000291668
-0 0.00086223 -0.000383884
-0 0.000817392 -0.00047192
+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.000701401 -0.000631548
-0 0.000631552 -0.000701435
-0 0.000554774 -0.000763573
-0 0.000471924 -0.000817388
-0 0.000383895 -0.000862263
-0 0.000291657 -0.000897638
-0 0.000196241 -0.000923224
-0 9.86569e-005 -0.000938661
+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
@@ -1813,42 +1778,86 @@ refs 3
 0 0.5 0.5
 kids 0
 OBJECT poly
-name "egt1"
-loc 0.000794735 0.0234148 0.0675115
-texture "symbols.png"
-crease 45.000000
+name "n11"
+loc 0.000492332 0.066011 0.0597831
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
 numvert 4
-0 -0.00191253 0.00649205
-0 -0.00247378 0.00629334
-0 0.00199804 -0.00650768
-0 0.00312056 -0.00611024
+0 0.00935113 0.000477958
+0 -0.00856084 0.000477958
+0 -0.00856084 -0.000478942
+0 0.00935113 -0.000478942
 numsurf 1
-SURF 0x30
-mat 0
+SURF 0x0
+mat 4
 refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
+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.000794735 0.0553275 0.0669296
-texture "symbols.png"
+name "egt2"
+loc 0.000492332 0.0346077 0.00416768
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.009191 -0.000478942
+0 -0.00841424 -0.000478942
+0 -0.00841424 0.000477958
+0 0.009191 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 "egt1"
+loc 0.000492332 0.0346077 0.0597831
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.009191 0.000477958
+0 -0.00841424 0.000477958
+0 -0.00841424 -0.000478942
+0 0.009191 -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 "flapc"
+loc 0.000794735 0.00884851 -0.0438111
+texture "grey.png"
 crease 45.000000
 numvert 4
-0 0.00321126 -0.00688677
-0 0.00197697 -0.00733124
-0 -0.0029401 0.00698441
-0 -0.00232298 0.00720663
+0 0.00185478 0.00414005
+0 0.00185478 -0.00406742
+0 -0.00185479 -0.00219462
+0 -0.00185479 0.00246911
 numsurf 1
 SURF 0x30
 mat 0
 refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
+3 0.726161 0.346401
+2 0.702121 0.346401
+1 0.687308 0.324581
+0 0.742187 0.324581
 kids 0
 OBJECT poly
 name "flap"
diff --git a/Models/Instruments/Upper-ECAM/resCFM/needle.png b/Models/Instruments/Upper-ECAM/resCFM/needle.png
new file mode 100644
index 00000000..7eae21df
Binary files /dev/null and b/Models/Instruments/Upper-ECAM/resCFM/needle.png differ
diff --git a/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac b/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac
index 4fca358d..65187954 100644
--- a/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac
+++ b/Models/Instruments/Upper-ECAM/resIAE/eicasIAE.ac
@@ -3,73 +3,1073 @@ MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 1 1 1  spec 0 0 0  shi 128
 MATERIAL "DefaultWhite.001" rgb 0 0 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 64  trans 0
 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647  spec 0 0 0  shi 0  trans 0
 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
 OBJECT poly
+name "egt2"
+loc 0.000492332 0.039771 0.00416768
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.009191 0.000477958
+0 -0.00841424 0.000477958
+0 -0.00841424 -0.000478942
+0 0.009191 -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 "egt1"
+loc 0.000492332 0.039771 0.0597831
+data 10
+enginepane
+texture "needle.png"
+crease 30.000002
+numvert 4
+0 0.009191 -0.000478942
+0 -0.00841424 -0.000478942
+0 -0.00841424 0.000477958
+0 0.009191 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 "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
+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
+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 "eprlimy2"
+loc 0.00028362 0.0760581 -0.00098132
+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 "thrpos2"
-loc 0.000314596 0.0546495 0.0202312
+loc 0.000314596 0.0772602 0.00416738
+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 "thrpos2"
+loc 0.000305618 0.0772602 0.00416738
 crease 45.000000
 numvert 61
 0 0 0
-0 -6.26519e-005 -0.000596091
-0 -0.000124622 -0.000586286
-0 -0.000185218 -0.000570036
-0 -0.000243787 -0.000547573
-0 -0.000299696 -0.000519082
-0 -0.000352304 -0.000484921
-0 -0.000401057 -0.00044544
+0 -9.86606e-005 -0.000938662
+0 -0.000196248 -0.000923224
+0 -0.00029166 -0.000897639
+0 -0.000383899 -0.000862264
+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.000862264
+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 "epr2"
+loc 0.000492332 0.0683627 0.00416768
+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
+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 "eprlimy1"
+loc 0.00028362 0.0760581 0.0546341
+texture "yellow.png"
+crease 30.000002
+numvert 4
+0 0.000633299 0.00459963
+0 0.00060828 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 "thrpos1"
+loc 0.000314596 0.0772602 0.0597828
+crease 45.000000
+numvert 61
+0 0 0
+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.000484921
+0 -0.000401065 -0.00044544
 0 -0.000445426 -0.000401065
-0 -0.000484906 -0.000352308
-0 -0.000519078 -0.000299692
-0 -0.000547551 -0.000243783
-0 -0.00057004 -0.000185229
-0 -0.000586279 -0.000124618
-0 -0.000596087 -6.26594e-005
-0 -0.000599377 0
-0 -0.000596087 6.26594e-005
-0 -0.000586279 0.000124618
-0 -0.00057004 0.000185229
-0 -0.000547551 0.000243783
-0 -0.000519078 0.000299692
-0 -0.000484906 0.000352308
+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.000401057 0.00044544
-0 -0.000352304 0.000484906
-0 -0.000299696 0.000519082
-0 -0.000243787 0.000547573
-0 -0.000185218 0.000570036
-0 -0.000124622 0.000586286
-0 -6.26519e-005 0.000596091
+0 -0.000401065 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.26594e-005 0.000596091
 0 0 0.000599384
-0 6.26519e-005 0.000596091
-0 0.000124622 0.000586286
-0 0.000185218 0.000570036
-0 0.000243787 0.000547573
-0 0.000299696 0.000519082
-0 0.000352304 0.000484906
-0 0.000401057 0.00044544
+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.000484906 0.000352308
-0 0.000519078 0.000299692
-0 0.000547551 0.000243783
-0 0.00057004 0.000185229
-0 0.000586279 0.000124618
-0 0.000596087 6.26594e-005
-0 0.000599377 0
-0 0.000596087 -6.26594e-005
-0 0.000586279 -0.000124618
-0 0.00057004 -0.000185229
-0 0.000547551 -0.000243783
-0 0.000519078 -0.000299692
-0 0.000484906 -0.000352308
+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.000401057 -0.00044544
-0 0.000352304 -0.000484906
-0 0.000299696 -0.000519082
-0 0.000243787 -0.000547573
-0 0.000185218 -0.000570036
-0 0.000124622 -0.000586286
-0 6.26519e-005 -0.000596091
+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
 numsurf 60
 SURF 0x30
@@ -434,70 +1434,70 @@ refs 3
 0 0.5 0.5
 kids 0
 OBJECT poly
-name "thrpos2"
-loc 0.000305618 0.0546495 0.0202312
+name "thrpos1"
+loc 0.000305618 0.0772602 0.0597828
 crease 45.000000
 numvert 61
 0 0 -0.00094384
-0 9.86569e-005 -0.000938661
-0 0.000196241 -0.000923224
-0 0.000291657 -0.000897638
-0 0.000383895 -0.000862263
-0 0.000471924 -0.000817388
-0 0.000554774 -0.000763573
-0 0.000631552 -0.000701435
-0 0.000701401 -0.000631548
+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.000817392 -0.00047192
-0 0.00086223 -0.000383884
-0 0.000897642 -0.000291668
-0 0.00092322 -0.000196233
-0 0.000938661 -9.86606e-005
+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.000938661 9.86606e-005
-0 0.00092322 0.000196233
-0 0.000897642 0.000291668
-0 0.00086223 0.000383884
-0 0.000817392 0.00047192
+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.000701401 0.000631548
-0 0.000631552 0.000701435
-0 0.000554774 0.000763573
-0 0.000471924 0.000817388
-0 0.000383895 0.000862263
-0 0.000291657 0.000897638
-0 0.000196241 0.000923224
-0 9.86569e-005 0.000938661
+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
-0 -9.86569e-005 0.000938661
-0 -0.000196241 0.000923224
-0 -0.000291657 0.000897638
-0 -0.000383895 0.000862263
-0 -0.000471924 0.000817388
-0 -0.000554774 0.000763573
-0 -0.000631552 0.000701435
-0 -0.000701401 0.000631548
+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.000763573
+0 -0.000631556 0.000701435
+0 -0.000701398 0.000631548
 0 -0.00076358 0.00055477
-0 -0.000817392 0.00047192
-0 -0.00086223 0.000383884
-0 -0.000897642 0.000291668
-0 -0.00092322 0.000196233
-0 -0.000938661 9.86606e-005
+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.000938661 -9.86606e-005
-0 -0.00092322 -0.000196233
-0 -0.000897642 -0.000291668
-0 -0.00086223 -0.000383884
-0 -0.000817392 -0.00047192
+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.000701401 -0.000631548
-0 -0.000631552 -0.000701435
-0 -0.000554774 -0.000763595
-0 -0.000471924 -0.000817388
-0 -0.000383895 -0.000862263
-0 -0.000291657 -0.000897638
-0 -0.000196241 -0.000923224
-0 -9.86569e-005 -0.000938661
+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.000196248 -0.000923224
+0 -9.86606e-005 -0.000938661
 0 0 0
 numsurf 60
 SURF 0x30
@@ -862,42 +1862,25 @@ refs 3
 60 0.5 0.5
 kids 0
 OBJECT poly
-name "epr2"
-loc 0.000794735 0.0578141 0.0113751
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00217679 0.00719476
-0 -0.00279514 0.00698388
-0 0.0018301 -0.00731301
-0 0.00306685 -0.00689124
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "eprlimy2"
-loc 0.00028362 0.0590905 0.0212867
-texture "yellow.png"
+name "epr1"
+loc 0.000492332 0.0683627 0.0597831
+data 10
+enginepane
+texture "needle.png"
 crease 30.000002
 numvert 4
-0 -0.0045049 -0.00116534
-0 -0.00369225 -0.00086353
-0 -0.00417997 -0.00206228
-0 -0.00336739 -0.00176032
+0 0.00935113 -0.000478942
+0 -0.00856084 -0.000478942
+0 -0.00856084 0.000477958
+0 0.00935113 0.000477958
 numsurf 1
-SURF 0x20
-mat 3
+SURF 0x0
+mat 4
 refs 4
-3 0 0
-1 0 0
-0 0 0
-2 0 0
+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 "flapc"
@@ -919,962 +1902,10 @@ refs 4
 0 0.742187 0.324581
 kids 0
 OBJECT poly
-name "thrpos1"
-loc 0.000314596 0.0546495 0.0758574
-crease 45.000000
-numvert 61
-0 0 -0.000599384
-0 6.26519e-005 -0.000596091
-0 0.000124622 -0.000586286
-0 0.000185218 -0.000570036
-0 0.000243787 -0.000547573
-0 0.000299696 -0.000519082
-0 0.000352304 -0.000484906
-0 0.000401057 -0.00044544
-0 0.000445426 -0.000401065
-0 0.000484906 -0.000352308
-0 0.000519078 -0.000299692
-0 0.000547551 -0.000243783
-0 0.00057004 -0.000185229
-0 0.000586279 -0.000124618
-0 0.000596087 -6.26594e-005
-0 0.000599377 0
-0 0.000596087 6.26594e-005
-0 0.000586279 0.000124618
-0 0.00057004 0.000185229
-0 0.000547551 0.000243783
-0 0.000519078 0.000299692
-0 0.000484906 0.000352308
-0 0.000445426 0.000401065
-0 0.000401057 0.00044544
-0 0.000352304 0.000484906
-0 0.000299696 0.000519082
-0 0.000243787 0.000547573
-0 0.000185218 0.000570036
-0 0.000124622 0.000586286
-0 6.26519e-005 0.000596091
-0 0 0.000599384
-0 -6.26519e-005 0.000596091
-0 -0.000124622 0.000586286
-0 -0.000185218 0.000570036
-0 -0.000243787 0.000547573
-0 -0.000299696 0.000519082
-0 -0.000352304 0.000484906
-0 -0.000401057 0.00044544
-0 -0.000445426 0.000401065
-0 -0.000484906 0.000352308
-0 -0.000519078 0.000299692
-0 -0.000547551 0.000243783
-0 -0.00057004 0.000185229
-0 -0.000586279 0.000124618
-0 -0.000596087 6.26594e-005
-0 -0.000599377 0
-0 -0.000596087 -6.26594e-005
-0 -0.000586279 -0.000124618
-0 -0.00057004 -0.000185229
-0 -0.000547551 -0.000243783
-0 -0.000519078 -0.000299692
-0 -0.000484906 -0.000352308
-0 -0.000445426 -0.000401065
-0 -0.000401057 -0.00044544
-0 -0.000352304 -0.000484921
-0 -0.000299696 -0.000519082
-0 -0.000243787 -0.000547573
-0 -0.000185218 -0.000570036
-0 -0.000124622 -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 "thrpos1"
-loc 0.000305618 0.0546495 0.0758574
-crease 45.000000
-numvert 61
-0 0 0
-0 -9.86569e-005 -0.000938661
-0 -0.000196241 -0.000923224
-0 -0.000291657 -0.000897638
-0 -0.000383895 -0.000862263
-0 -0.000471924 -0.000817388
-0 -0.000554774 -0.000763595
-0 -0.000631552 -0.000701435
-0 -0.000701401 -0.000631548
-0 -0.00076358 -0.00055477
-0 -0.000817392 -0.00047192
-0 -0.00086223 -0.000383884
-0 -0.000897642 -0.000291668
-0 -0.00092322 -0.000196233
-0 -0.000938661 -9.86606e-005
-0 -0.00094384 0
-0 -0.000938661 9.86606e-005
-0 -0.00092322 0.000196233
-0 -0.000897642 0.000291668
-0 -0.00086223 0.000383884
-0 -0.000817392 0.00047192
-0 -0.00076358 0.00055477
-0 -0.000701401 0.000631548
-0 -0.000631552 0.000701435
-0 -0.000554774 0.000763573
-0 -0.000471924 0.000817388
-0 -0.000383895 0.000862263
-0 -0.000291657 0.000897638
-0 -0.000196241 0.000923224
-0 -9.86569e-005 0.000938661
-0 0 0.00094384
-0 9.86569e-005 0.000938661
-0 0.000196241 0.000923224
-0 0.000291657 0.000897638
-0 0.000383895 0.000862263
-0 0.000471924 0.000817388
-0 0.000554774 0.000763573
-0 0.000631552 0.000701435
-0 0.000701401 0.000631548
-0 0.00076358 0.00055477
-0 0.000817392 0.00047192
-0 0.00086223 0.000383884
-0 0.000897642 0.000291668
-0 0.00092322 0.000196233
-0 0.000938661 9.86606e-005
-0 0.00094384 0
-0 0.000938661 -9.86606e-005
-0 0.00092322 -0.000196233
-0 0.000897642 -0.000291668
-0 0.00086223 -0.000383884
-0 0.000817392 -0.00047192
-0 0.00076358 -0.00055477
-0 0.000701401 -0.000631548
-0 0.000631552 -0.000701435
-0 0.000554774 -0.000763573
-0 0.000471924 -0.000817388
-0 0.000383895 -0.000862263
-0 0.000291657 -0.000897638
-0 0.000196241 -0.000923224
-0 9.86569e-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.000794735 -0.000432765 0.0122329
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00211262 0.00644416
-0 -0.00267386 0.00624546
-0 0.00179795 -0.00655557
-0 0.00292047 -0.00615813
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "n11"
-loc 0.000794735 -0.000432765 0.0678275
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00292047 -0.00615813
-0 0.00179795 -0.00655557
-0 -0.00267386 0.00624546
-0 -0.00211262 0.00644416
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "egt2"
-loc 0.000794735 0.0294379 0.0121803
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00292047 -0.00615813
-0 0.00179795 -0.00655557
-0 -0.00267386 0.00624546
-0 -0.00211262 0.00644416
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "egt1"
-loc 0.000794735 0.0294379 0.0678275
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00211262 0.00644416
-0 -0.00267386 0.00624546
-0 0.00179795 -0.00655557
-0 0.00292047 -0.00615813
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "epr1"
-loc 0.000794735 0.0578141 0.0670013
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00306685 -0.00689124
-0 0.0018301 -0.00731301
-0 -0.00279514 0.00698388
-0 -0.00217679 0.00719476
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.343129 0.181706
-2 0.343129 0.146419
-1 0.0771681 0.146419
-0 0.0771681 0.181706
-kids 0
-OBJECT poly
 name "XX2"
 loc 1.91422e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
-hidden
 numvert 10
 0 0.106466 0.533966
 0 0.106466 0.533514
@@ -1921,7 +1952,6 @@ name "XX1"
 loc 1.91422e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
-hidden
 numvert 12
 0 0.106466 0.553931
 0 0.106466 0.588269
@@ -1993,7 +2023,6 @@ name "XX4"
 loc 1.91422e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
-hidden
 numvert 6
 0 0.0779447 0.497174
 0 0.0779447 0.503764
@@ -2022,7 +2051,6 @@ name "XX3"
 loc 1.91422e-005 -0.0851298 -0.51126
 texture "eicasIAE-extra.png"
 crease 45.000000
-hidden
 numvert 8
 0 0.0779447 0.593324
 0 0.0779447 0.553931
@@ -2233,22 +2261,3 @@ refs 4
 9 0.969186 0.653651
 1 0.969142 0.379501
 kids 0
-OBJECT poly
-name "eprlimy1"
-loc 0.00028362 0.0590905 0.0769129
-texture "yellow.png"
-crease 30.000002
-numvert 4
-0 -0.00336739 -0.00176032
-0 -0.00417997 -0.00206228
-0 -0.00369225 -0.00086353
-0 -0.0045049 -0.00116534
-numsurf 1
-SURF 0x20
-mat 3
-refs 4
-0 0 0
-2 0 0
-3 0 0
-1 0 0
-kids 0
diff --git a/Models/Instruments/Upper-ECAM/resIAE/needle.png b/Models/Instruments/Upper-ECAM/resIAE/needle.png
new file mode 100644
index 00000000..7eae21df
Binary files /dev/null and b/Models/Instruments/Upper-ECAM/resIAE/needle.png differ
diff --git a/Models/Liveries/A320/IAE/FEG.png b/Models/Liveries/A320/IAE/FEG.png
new file mode 100644
index 00000000..4943b752
Binary files /dev/null and b/Models/Liveries/A320/IAE/FEG.png differ
diff --git a/Models/Liveries/A320/IAE/FEG.xml b/Models/Liveries/A320/IAE/FEG.xml
new file mode 100644
index 00000000..3235902a
--- /dev/null
+++ b/Models/Liveries/A320/IAE/FEG.xml
@@ -0,0 +1,16 @@
+<PropertyList>
+  <sim>
+    <model>
+      <livery>
+        <name type="string">FlyEgypt</name>
+        <texture>Liveries/A320/IAE/FEG.png</texture>
+      </livery>
+    </model>
+  </sim>
+  
+	<options>
+		<EIS2 type="bool">1</EIS2>
+	</options>
+  
+	<sharklet type="bool">0</sharklet>
+</PropertyList>
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index f692b3a1..960b56b2 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -30,6 +30,9 @@ var fctlInit = func {
 	setprop("/systems/fctl/fac2", 0);
 }
 
+setprop("/it-fbw/roll-back", 0);
+setprop("/it-fbw/spd-hold", 0);
+
 ###################
 # Update Function #
 ###################
@@ -96,47 +99,16 @@ var update_loop = func {
 
 	var ail = getprop("/controls/flight/aileron");
 	
-	if (getprop("/it-fbw/law") == 0) {
-		if (ail > 0.4 or ail < -0.4) {
-			setprop("/it-fbw/roll-lim-max", "67");
-			setprop("/it-fbw/roll-lim-min", "-67");
-		} else if (ail < 0.05 and ail > -0.05) {
-			setprop("/it-fbw/roll-lim-max", "33");
-			setprop("/it-fbw/roll-lim-min", "-33");
-		} else {
-			if (getprop("/it-fbw/roll-deg") > 33) {
-				setprop("/it-fbw/roll-deg", "33");
-			} else if (getprop("/it-fbw/roll-deg") < -33) {
-				setprop("/it-fbw/roll-deg", "-33");
-			}
+	if (ail > 0.4 or ail < -0.4) {
+		setprop("/it-fbw/roll-lim", "67");
+		if (getprop("/it-fbw/roll-back") == 0 and (getprop("/orientation/roll-deg") > 33.5 or getprop("/orientation/roll-deg") < -33.5)) {
+			setprop("/it-fbw/roll-back", 1);
 		}
-	} else if (getprop("/it-fbw/law") == 1) {
-		setprop("/it-fbw/roll-lim-max", "160");
-		setprop("/it-fbw/roll-lim-min", "-160");
-	} else {
-		setprop("/it-fbw/roll-lim-max", "33");
-		setprop("/it-fbw/roll-lim-min", "-33");
-	}
-
-	var elev = getprop("/controls/flight/elevator");
-	
-	if (getprop("/it-fbw/law") == 0) {
-		if (getprop("/position/gear-agl-ft") <= 2) {
-			setprop("/it-fbw/pitch-lim-max", "15");
-			setprop("/it-fbw/pitch-lim-min", "-5");
-		} else if (getprop("/controls/flight/flap-lever") == 4) {
-			setprop("/it-fbw/pitch-lim-max", "25");
-			setprop("/it-fbw/pitch-lim-min", "-15");
-		} else {
-			setprop("/it-fbw/pitch-lim-max", "30");
-			setprop("/it-fbw/pitch-lim-min", "-15");
+	} else if (ail < 0.05 and ail > -0.05) {
+		setprop("/it-fbw/roll-lim", "33");
+		if (getprop("/it-fbw/roll-back") == 1 and getprop("/orientation/roll-deg") <= 33.5 and getprop("/orientation/roll-deg") >= -33.5) {
+			setprop("/it-fbw/roll-back", 0);
 		}
-	} else if (getprop("/it-fbw/law") == 1) {
-		setprop("/it-fbw/pitch-lim-max", "160");
-		setprop("/it-fbw/pitch-lim-min", "-160");
-	} else {
-		setprop("/it-fbw/pitch-lim-max", "15");
-		setprop("/it-fbw/pitch-lim-min", "-15");
 	}
 
 	if (getprop("/it-fbw/override") == 0) {
diff --git a/Splash/A318/a318-1.png b/Splash/A318/a318-1.png
new file mode 100644
index 00000000..3c2d65be
Binary files /dev/null and b/Splash/A318/a318-1.png differ
diff --git a/Splash/A318/a318-2.png b/Splash/A318/a318-2.png
new file mode 100644
index 00000000..1c63b7f6
Binary files /dev/null and b/Splash/A318/a318-2.png differ
diff --git a/Splash/A319/a319-1.png b/Splash/A319/a319-1.png
new file mode 100644
index 00000000..d5b2261f
Binary files /dev/null and b/Splash/A319/a319-1.png differ
diff --git a/Splash/A319/a319-2.png b/Splash/A319/a319-2.png
new file mode 100644
index 00000000..7e276591
Binary files /dev/null and b/Splash/A319/a319-2.png differ
diff --git a/Splash/A319/a319-3.png b/Splash/A319/a319-3.png
new file mode 100644
index 00000000..3708c657
Binary files /dev/null and b/Splash/A319/a319-3.png differ
diff --git a/Splash/a320-1.png b/Splash/A320/a320-1.png
similarity index 100%
rename from Splash/a320-1.png
rename to Splash/A320/a320-1.png
diff --git a/Splash/a320-2.png b/Splash/A320/a320-2.png
similarity index 100%
rename from Splash/a320-2.png
rename to Splash/A320/a320-2.png
diff --git a/Splash/a320-3.png b/Splash/A320/a320-3.png
similarity index 100%
rename from Splash/a320-3.png
rename to Splash/A320/a320-3.png
diff --git a/Splash/A320/a320-4.png b/Splash/A320/a320-4.png
new file mode 100644
index 00000000..a5efd5cc
Binary files /dev/null and b/Splash/A320/a320-4.png differ
diff --git a/Splash/A320/a320-5.png b/Splash/A320/a320-5.png
new file mode 100644
index 00000000..72ffa82e
Binary files /dev/null and b/Splash/A320/a320-5.png differ
diff --git a/Splash/A320/a320-6.png b/Splash/A320/a320-6.png
new file mode 100644
index 00000000..bf403647
Binary files /dev/null and b/Splash/A320/a320-6.png differ
diff --git a/Splash/A320/a320-7.png b/Splash/A320/a320-7.png
new file mode 100644
index 00000000..b279a09f
Binary files /dev/null and b/Splash/A320/a320-7.png differ
diff --git a/Splash/a320n-1.png b/Splash/A320N/a320n-1.png
similarity index 100%
rename from Splash/a320n-1.png
rename to Splash/A320N/a320n-1.png
diff --git a/Splash/a320n-2.png b/Splash/A320N/a320n-2.png
similarity index 100%
rename from Splash/a320n-2.png
rename to Splash/A320N/a320n-2.png
diff --git a/Splash/a320n-3.png b/Splash/A320N/a320n-3.png
similarity index 100%
rename from Splash/a320n-3.png
rename to Splash/A320N/a320n-3.png
diff --git a/Splash/a320n-4.png b/Splash/A320N/a320n-4.png
similarity index 100%
rename from Splash/a320n-4.png
rename to Splash/A320N/a320n-4.png
diff --git a/Splash/A320N/a320n-5.png b/Splash/A320N/a320n-5.png
new file mode 100644
index 00000000..2ae980d6
Binary files /dev/null and b/Splash/A320N/a320n-5.png differ
diff --git a/Splash/a321-1.png b/Splash/A321/a321-1.png
similarity index 100%
rename from Splash/a321-1.png
rename to Splash/A321/a321-1.png
diff --git a/Splash/a321-2.png b/Splash/A321/a321-2.png
similarity index 100%
rename from Splash/a321-2.png
rename to Splash/A321/a321-2.png
diff --git a/Splash/A321/a321-3.png b/Splash/A321/a321-3.png
new file mode 100644
index 00000000..d558686f
Binary files /dev/null and b/Splash/A321/a321-3.png differ
diff --git a/Splash/A321N/a321n-1.png b/Splash/A321N/a321n-1.png
new file mode 100644
index 00000000..50ef5831
Binary files /dev/null and b/Splash/A321N/a321n-1.png differ
diff --git a/Splash/A321N/a321n-2.png b/Splash/A321N/a321n-2.png
new file mode 100644
index 00000000..b35c8dc4
Binary files /dev/null and b/Splash/A321N/a321n-2.png differ
diff --git a/Splash/a320-100.png b/Splash/a320-100.png
deleted file mode 100644
index afd10bed..00000000
Binary files a/Splash/a320-100.png and /dev/null differ
diff --git a/Systems/a318-aerodynamics.xml b/Systems/a318-aerodynamics.xml
index 24831ba1..39b99d29 100644
--- a/Systems/a318-aerodynamics.xml
+++ b/Systems/a318-aerodynamics.xml
@@ -2,7 +2,7 @@
 <!-- Joshua Davidson (it0uchpods) -->
 
 <aerodynamics>
-    <property value="0.0">ice/wing</property>
+	<property value="0.0">ice/wing</property>
 	<axis name="LIFT">
 
 		<function name="aero/force/Lift_alpha">
@@ -71,7 +71,7 @@
 			</product>
 		</function>
 
-		<function name="aero/force/Lift_wingice">
+		<function name="aero/coefficient/CLicew">
 			<description>Lift_decrease_due_to_ice_on_wing</description>
 				<product>
 					<property>aero/qbar-psf</property>
@@ -202,7 +202,21 @@
 				<value>0.035</value>
 			</product>
 		</function>
-		
+
+	</axis>
+
+	<axis name="SIDE">
+
+		<function name="aero/force/Side_beta">
+			<description>Side force due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/beta-rad</property>
+				<value>-1</value>
+			</product>
+		</function>
+
 		<function name="aero/force/Drag_wingice">
 				<description>Drag_due_to_ice_on_wing</description>
 				<product>
@@ -219,21 +233,6 @@
 					</table>
 				</product>
 		</function>
-
-	</axis>
-
-	<axis name="SIDE">
-
-		<function name="aero/force/Side_beta">
-			<description>Side force due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>aero/beta-rad</property>
-				<value>-1</value>
-			</product>
-		</function>
-
 	</axis>
 
 	<axis name="ROLL">
@@ -401,4 +400,4 @@
 		</function>
 
 	</axis>
-</aerodynamics>
+</aerodynamics>
\ No newline at end of file
diff --git a/Systems/a319-aerodynamics.xml b/Systems/a319-aerodynamics.xml
index 24831ba1..39b99d29 100644
--- a/Systems/a319-aerodynamics.xml
+++ b/Systems/a319-aerodynamics.xml
@@ -2,7 +2,7 @@
 <!-- Joshua Davidson (it0uchpods) -->
 
 <aerodynamics>
-    <property value="0.0">ice/wing</property>
+	<property value="0.0">ice/wing</property>
 	<axis name="LIFT">
 
 		<function name="aero/force/Lift_alpha">
@@ -71,7 +71,7 @@
 			</product>
 		</function>
 
-		<function name="aero/force/Lift_wingice">
+		<function name="aero/coefficient/CLicew">
 			<description>Lift_decrease_due_to_ice_on_wing</description>
 				<product>
 					<property>aero/qbar-psf</property>
@@ -202,7 +202,21 @@
 				<value>0.035</value>
 			</product>
 		</function>
-		
+
+	</axis>
+
+	<axis name="SIDE">
+
+		<function name="aero/force/Side_beta">
+			<description>Side force due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/beta-rad</property>
+				<value>-1</value>
+			</product>
+		</function>
+
 		<function name="aero/force/Drag_wingice">
 				<description>Drag_due_to_ice_on_wing</description>
 				<product>
@@ -219,21 +233,6 @@
 					</table>
 				</product>
 		</function>
-
-	</axis>
-
-	<axis name="SIDE">
-
-		<function name="aero/force/Side_beta">
-			<description>Side force due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>aero/beta-rad</property>
-				<value>-1</value>
-			</product>
-		</function>
-
 	</axis>
 
 	<axis name="ROLL">
@@ -401,4 +400,4 @@
 		</function>
 
 	</axis>
-</aerodynamics>
+</aerodynamics>
\ No newline at end of file
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index 7d59bfe3..39b99d29 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -400,4 +400,4 @@
 		</function>
 
 	</axis>
-</aerodynamics>
+</aerodynamics>
\ No newline at end of file
diff --git a/Systems/a321-aerodynamics.xml b/Systems/a321-aerodynamics.xml
index 47a3d268..39b99d29 100644
--- a/Systems/a321-aerodynamics.xml
+++ b/Systems/a321-aerodynamics.xml
@@ -70,7 +70,7 @@
 				<value>0.04</value>
 			</product>
 		</function>
-		
+
 		<function name="aero/coefficient/CLicew">
 			<description>Lift_decrease_due_to_ice_on_wing</description>
 				<product>
@@ -203,6 +203,20 @@
 			</product>
 		</function>
 
+	</axis>
+
+	<axis name="SIDE">
+
+		<function name="aero/force/Side_beta">
+			<description>Side force due to beta</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/beta-rad</property>
+				<value>-1</value>
+			</product>
+		</function>
+
 		<function name="aero/force/Drag_wingice">
 				<description>Drag_due_to_ice_on_wing</description>
 				<product>
@@ -221,20 +235,6 @@
 		</function>
 	</axis>
 
-	<axis name="SIDE">
-
-		<function name="aero/force/Side_beta">
-			<description>Side force due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>aero/beta-rad</property>
-				<value>-1</value>
-			</product>
-		</function>
-
-	</axis>
-
 	<axis name="ROLL">
 
 		<function name="aero/moment/Roll_beta">
@@ -400,4 +400,4 @@
 		</function>
 
 	</axis>
-</aerodynamics>
+</aerodynamics>
\ No newline at end of file
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 935f01ad..a4b02ba7 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -59,7 +59,7 @@
                 <table>
                     <property>/position/altitude-ft</property> 
                     <entry><ind>    0</ind><dep>0.444</dep></entry>
-                    <entry><ind>42000</ind><dep>0.684</dep></entry>
+                    <entry><ind>42000</ind><dep>0.784</dep></entry>
                 </table>
             </expression>
         </input>
@@ -76,8 +76,8 @@
                 <table>
                     <property>/position/altitude-ft</property> 
                     <entry><ind>    0</ind><dep>0.992</dep></entry>
-                    <entry><ind>13000</ind><dep>0.977</dep></entry>
-                    <entry><ind>42000</ind><dep>0.969</dep></entry>
+                    <entry><ind>13000</ind><dep>0.975</dep></entry>
+                    <entry><ind>42000</ind><dep>0.966</dep></entry>
                 </table>
             </expression>
         </input>
@@ -95,7 +95,6 @@
                     <property>/engines/engine[0]/n1</property>
                     <entry><ind> 18.0</ind><dep>0.00</dep></entry>
                     <entry><ind> 22.4</ind><dep>0.03</dep></entry>
-                    <entry><ind> 35.0</ind><dep>0.20</dep></entry>
                     <entry><ind>105.8</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -142,7 +141,6 @@
                 <table>
                     <property>/engines/flx-thr</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -153,7 +151,6 @@
                 <table>
                     <property>/controls/engines/engine[0]/throttle-man</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -189,7 +186,6 @@
                     <property>/engines/engine[1]/n1</property> 
                     <entry><ind> 18.0</ind><dep>0.00</dep></entry>
                     <entry><ind> 22.4</ind><dep>0.03</dep></entry>
-                    <entry><ind> 35.0</ind><dep>0.20</dep></entry>
                     <entry><ind>105.8</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -236,7 +232,6 @@
                 <table>
                     <property>/engines/flx-thr</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -247,7 +242,6 @@
                 <table>
                     <property>/controls/engines/engine[1]/throttle-man</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -282,7 +276,6 @@
                 <table>
                     <property>/controls/engines/engine[0]/throttle-cmd-pid</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -317,7 +310,6 @@
                 <table>
                     <property>/controls/engines/engine[1]/throttle-cmd-pid</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -710,7 +702,6 @@
                 <table>
                     <value>0.88</value>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -745,7 +736,6 @@
                 <table>
                     <value>0.84</value>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -780,7 +770,6 @@
                 <table>
 					<property>/engines/flx-thr</property>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
@@ -815,7 +804,6 @@
                 <table>
                     <value>0.80</value>
                     <entry><ind>0.000</ind><dep>0.03</dep></entry>
-                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
                     <entry><ind>1.000</ind><dep>1.00</dep></entry>
                 </table>
             </expression>
diff --git a/Systems/fcs.xml b/Systems/fcs.xml
index 1d4af61f..980c7a3f 100644
--- a/Systems/fcs.xml
+++ b/Systems/fcs.xml
@@ -42,7 +42,7 @@
 
 	<aerosurface_scale name="Left Aileron Control">
 		<input>fcs/roll-trim-sum</input>
-		<gain>0.022</gain>
+		<gain>0.02</gain>
 		<range>
 		<min>-15</min>
 		<max>15</max>
@@ -52,7 +52,7 @@
 
 	<aerosurface_scale name="Right Aileron Control">
 		<input>-fcs/roll-trim-sum</input>
-		<gain>0.022</gain>
+		<gain>0.02</gain>
 		<range>
 		<min>-15</min>
 		<max>15</max>
@@ -336,4 +336,4 @@
         
     </channel>
 
-</system>
+</system>
\ No newline at end of file
diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml
index 0eb81e32..87777a83 100644
--- a/Systems/hydraulics.xml
+++ b/Systems/hydraulics.xml
@@ -282,7 +282,7 @@
  <!-- =============================================================== -->
  <!-- Spoiler Control                                                 -->
  <!-- =============================================================== -->
- 
+	
 	<!-- Spoiler L1 -->
 	
 	<filter>
@@ -343,7 +343,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-l1-cmd</input>
 		<output>/controls/flight/spoiler-l1</output>
-		<max-rate-of-change>0.5</max-rate-of-change>
+		<max-rate-of-change>0.6</max-rate-of-change>
 	</filter>
  
 	<!-- Spoiler L2 -->
@@ -468,7 +468,7 @@
                 <table>
                     <property>/controls/flight/spoiler-left-fbw-cmd</property> 
                     <entry><ind>-0.1</ind><dep>  0</dep></entry>
-                    <entry><ind>-1.0</ind><dep>0.3</dep></entry>
+                    <entry><ind>-1.0</ind><dep>0.5</dep></entry>
                 </table>
             </expression>
 		</input>
@@ -482,7 +482,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-l2-cmd</input>
 		<output>/controls/flight/spoiler-l2</output>
-		<max-rate-of-change>0.4</max-rate-of-change>
+		<max-rate-of-change>0.5</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler L3 -->
@@ -611,7 +611,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-l3-cmd</input>
 		<output>/controls/flight/spoiler-l3</output>
-		<max-rate-of-change>0.6</max-rate-of-change>
+		<max-rate-of-change>0.4</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler L4 -->
@@ -740,7 +740,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-l4-cmd</input>
 		<output>/controls/flight/spoiler-l4</output>
-		<max-rate-of-change>0.6</max-rate-of-change>
+		<max-rate-of-change>0.7</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler L5 -->
@@ -916,7 +916,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-r1-cmd</input>
 		<output>/controls/flight/spoiler-r1</output>
-		<max-rate-of-change>0.5</max-rate-of-change>
+		<max-rate-of-change>0.6</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler R2 -->
@@ -1041,7 +1041,7 @@
                 <table>
                     <property>/controls/flight/spoiler-right-fbw-cmd</property> 
                     <entry><ind>0.1</ind><dep>  0</dep></entry>
-                    <entry><ind>1.0</ind><dep>0.3</dep></entry>
+                    <entry><ind>1.0</ind><dep>0.5</dep></entry>
                 </table>
             </expression>
 		</input>
@@ -1055,7 +1055,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-r2-cmd</input>
 		<output>/controls/flight/spoiler-r2</output>
-		<max-rate-of-change>0.4</max-rate-of-change>
+		<max-rate-of-change>0.5</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler R3 -->
@@ -1184,7 +1184,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-r3-cmd</input>
 		<output>/controls/flight/spoiler-r3</output>
-		<max-rate-of-change>0.6</max-rate-of-change>
+		<max-rate-of-change>0.4</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler R4 -->
@@ -1313,7 +1313,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-r4-cmd</input>
 		<output>/controls/flight/spoiler-r4</output>
-		<max-rate-of-change>0.6</max-rate-of-change>
+		<max-rate-of-change>0.7</max-rate-of-change>
 	</filter>
 	
 	<!-- Spoiler R5 -->
@@ -1441,15 +1441,25 @@
             <expression>
 				<product>
 					<sum>
-						<property>/controls/flight/aileron-left</property>
-						<property>/controls/flight/aileron-right</property>
 						<product>
-							<property>/controls/flight/spoiler-l-sum</property>
-							<value>-1.0</value>
+							<sum>
+								<property>/controls/flight/aileron-left</property>
+								<property>/controls/flight/aileron-right</property>
+							</sum>
+							<value>1.75</value>
+						</product>
+						<product>
+							<sum>
+								<product>
+									<property>/controls/flight/spoiler-l-sum</property>
+									<value>-1.0</value>
+								</product>
+								<property>/controls/flight/spoiler-r-sum</property>
+							</sum>
+							<value>0.25</value>
 						</product>
-						<property>/controls/flight/spoiler-r-sum</property>
 					</sum>
-					<value>0.3571</value>
+					<value>0.444444</value>
 				</product>
             </expression>
 		</input>
diff --git a/Systems/it-fbw-b.xml b/Systems/it-fbw-b.xml
deleted file mode 100644
index 8637d48f..00000000
--- a/Systems/it-fbw-b.xml
+++ /dev/null
@@ -1,1029 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Airbus A3XX FBW System by Joshua Davidson (it0uchpods) -->
-<!-- For Roll, Pitch, and Yaw -->
-
-<PropertyList>
-
-
- <!-- =============================================================== -->
- <!-- Surface Position Feeding                                        -->
- <!-- =============================================================== -->
-	
-	<filter>
-		<debug>false</debug>
-		<type>noise-spike</type>
-		<input>/controls/flight/aileron</input>
-		<output>/controls/flight/aileron-input-fast</output>
-		<max-rate-of-change>5</max-rate-of-change>
-	</filter>
-	
-	<filter>
-		<debug>false</debug>
-		<type>noise-spike</type>
-		<input>/controls/flight/elevator</input>
-		<output>/controls/flight/elevator-input-fast</output>
-		<max-rate-of-change>5</max-rate-of-change>
-	</filter>
-	
-
-	<filter>
-		<debug>false</debug>
-		<type>noise-spike</type>
-		<input>/controls/flight/aileron</input>
-		<output>/controls/flight/aileron-input</output>
-		<max-rate-of-change>2.5</max-rate-of-change>
-	</filter>
-
-	<filter>
-		<debug>false</debug>
-		<type>noise-spike</type>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<less-than>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</less-than>
-					<greater-than-equals>
-						<property>/controls/flight/flap-pos</property>
-						<value>4</value>
-					</greater-than-equals>
-					<less-than>
-						<property>/controls/engines/engine[0]/throttle</property>
-						<value>0.65</value>
-					</less-than>
-					<less-than>
-						<property>/controls/engines/engine[1]/throttle</property>
-						<value>0.65</value>
-					</less-than>
-					<equals>
-						<property>/FMGC/status/to-state</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/law</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-            <expression>
-				<sum>
-					<property>/controls/flight/elevator</property>
-					<value>0.15</value>
-				</sum>
-            </expression>
-		</input>
-		<input>
-			<property>/controls/flight/elevator</property>
-		</input>
-		<output>/controls/flight/elevator-input</output>
-		<max-rate-of-change>2.5</max-rate-of-change>
-	</filter>
-
- <!-- =============================================================== -->
- <!-- Lateral                                                         -->
- <!-- =============================================================== -->
-	
-	<pid-controller>
-		<name>IT-FBW: ROLL</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/law</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<property>/orientation/roll-deg</property>
-		</input>
-		<reference>
-			<property>/it-fbw/roll-deg</property>
-		</reference>
-		<output>
-			<property>/controls/flight/aileron-fbw-cmd</property>
-		</output>
-		<config>
-			<Kp>0.11</Kp>
-			<beta>1</beta>
-			<alpha>0.1</alpha>
-			<gamma>0</gamma>
-			<Ti>5</Ti>
-			<Td>0.005</Td>
-			<u_min>-1</u_min>
-			<u_max>1</u_max>
-		</config>
-	</pid-controller>
-	
-	<filter>
-		<name>IT-FBW: ROLL OPTION</name>
-		<debug>false</debug>
-		<type>gain</type>
-		<gain>1</gain>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/law</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<property>/controls/flight/aileron-fbw-cmd</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<or>
-						<equals>
-							<property>/gear/gear[1]/wow</property>
-							<value>1</value>
-						</equals>
-						<equals>
-							<property>/gear/gear[2]/wow</property>
-							<value>1</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>2</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/flight/aileron-input</property>
-		</input>
-		<input>
-			<condition>
-				<or>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</condition>
-			<property>/controls/flight/aileron-fmgc</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/it-fbw/law</property>
-					<value>3</value>
-				</equals>
-			</condition>
-			<value>0</value>
-		</input>
-		<output>/controls/flight/roll-fbw</output>
-	</filter>
-	
-	<filter>
-		<name>IT-FBW: AILERON</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<input>/controls/flight/roll-fbw</input>
-		<output>/controls/flight/aileron-fbw</output>
-	</filter>
-	
-	<filter>
-		<name>IT-FBW: LEFT SPOILER</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/systems/failures/aileron-left</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/controls/flight/roll-fbw</property>
-					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
-					<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
-					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
-					<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
-					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/systems/failures/aileron-left</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/controls/flight/roll-fbw</property>
-					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
-					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
-					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/flight/spoiler-left-fbw-cmd</output>
-		<min>-1</min>
-		<max>1</max>
-	</filter>
-	
-	<filter>
-		<name>IT-FBW: RIGHT SPOILER</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/systems/failures/aileron-right</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/controls/flight/roll-fbw</property>
-					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
-					<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
-					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
-					<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
-					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/systems/failures/aileron-right</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/controls/flight/roll-fbw</property>
-					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
-					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
-					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/flight/spoiler-right-fbw-cmd</output>
-		<min>-1</min>
-		<max>1</max>
-	</filter>
-	
- <!-- =============================================================== -->
- <!-- Vertical                                                        -->
- <!-- =============================================================== -->
-	
-	<pid-controller>
-		<name>IT-FBW: PITCH</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value> 
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/spd-hold</property>
-						<value>0</value>
-					</equals>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<property>/orientation/pitch-deg</property>
-		</input>
-		<reference>
-			<property>/it-fbw/pitch-deg</property>
-		</reference>
-		<output>
-			<property>/controls/flight/elevator-fbw-cmd</property>
-		</output>
-		<config>
-			<Kp>-0.21</Kp>
-			<beta>1</beta>
-			<alpha>0.1</alpha>
-			<gamma>0</gamma>
-			<Ti>5</Ti>
-			<Td>0.002</Td>
-			<u_min>-1</u_min>
-			<u_max>1</u_max>
-		</config>
-	</pid-controller>
-	
-	<filter>
-		<name>IT-FBW: SPD PITCH TARGET CMD</name>
-		<type>noise-spike</type>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value> 
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/spd-hold</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input> 
-			<expression>
-				<table>
-					<property>/controls/flight/elevator-input</property>
-					<entry><ind> 0</ind><dep>129</dep></entry>
-					<entry><ind>-1</ind><dep>106</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/it-fbw/spd-pitch-target</output>
-		<max-rate-of-change>10</max-rate-of-change>
-	</filter>
-	
-	<pid-controller>
-		<name>IT-FBW: SPD PITCH TARGET</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value> 
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/spd-hold</property>
-						<value>1</value>
-					</equals>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
-		</input>
-		<reference>
-			<property>/it-fbw/spd-pitch-target</property>
-		</reference>
-		<output>
-			<property>/it-fbw/spd-pitch-deg</property>
-		</output>
-		<config>
-			<Kp>-0.50</Kp>
-			<beta>1.0</beta>    
-			<alpha>0.1</alpha>  
-			<gamma>0.0</gamma>  
-			<Ti>5.0</Ti>        
-			<Td>0.0001</Td>    
-			<u_min>-10</u_min>
-			<u_max>30</u_max>
-		</config>
-	</pid-controller>
-	
-	<pid-controller>
-		<name>IT-FBW: SPD PITCH</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value> 
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/spd-hold</property>
-						<value>1</value>
-					</equals>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<property>/orientation/pitch-deg</property>
-		</input>
-		<reference>
-			<property>/it-fbw/spd-pitch-deg</property>
-		</reference>
-		<output>
-			<property>/controls/flight/elevator-fbw-cmd</property>
-		</output>
-		<config>
-			<Kp>-0.08</Kp>
-			<beta>1</beta>
-			<alpha>0.1</alpha>
-			<gamma>0</gamma>
-			<Ti>5</Ti>
-			<Td>0.001</Td>
-			<u_min>-1</u_min>
-			<u_max>1</u_max>
-		</config>
-	</pid-controller>
-	
-	<filter>
-		<name>IT-FBW: PITCH OPTION</name>
-		<debug>false</debug>
-		<type>gain</type>
-		<gain>1</gain>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/flight/elevator-fbw-cmd</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<or>
-						<equals>
-							<property>/gear/gear[1]/wow</property>
-							<value>1</value>
-						</equals>
-						<equals>
-							<property>/gear/gear[2]/wow</property>
-							<value>1</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>2</value>
-						</equals>
-						<greater-than-equals>
-							<property>/orientation/roll-deg</property>
-							<value>40</value>
-						</greater-than-equals>
-						<less-than-equals>
-							<property>/orientation/roll-deg</property>
-							<value>-40</value>
-						</less-than-equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/flight/elevator-input</property>
-		</input>
-		<input>
-			<condition>
-				<or>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</condition>
-			<property>/controls/flight/elevator-fmgc</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/it-fbw/law</property>
-					<value>3</value>
-				</equals>
-			</condition>
-			<value>0</value>
-		</input>
-		<output>/controls/flight/elevator-fbw</output>
-	</filter>
-	
-	<pid-controller>
-		<name>FBW PITCH HELPER PLUS</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<greater-than>
-						<property>/controls/flight/elevator-fbw</property>
-						<value>0.01</value>
-					</greater-than>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-					<greater-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<value>0</value>
-		</input>
-		<reference>
-			<value>1</value>
-		</reference>
-		<output>
-			<property>/controls/flight/elevator-trim-cmd</property>
-		</output>
-		<config>
-			<Kp>0.09</Kp>
-			<beta>1.0</beta>
-			<alpha>0.1</alpha>
-			<gamma>0.0</gamma>
-			<Ti>10</Ti>
-			<Td>0.00001</Td>
-			<u_min>-1.00</u_min>
-			<u_max>1.00</u_max>
-		</config>
-	</pid-controller>
-	
-	<pid-controller>
-		<name>FBW PITCH HELPER MINUS</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<less-than>
-						<property>/controls/flight/elevator-fbw</property>
-						<value>-0.01</value>
-					</less-than>
-					<equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>0</value>
-					</equals>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-					<greater-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<value>0</value>
-		</input>
-		<reference>
-			<value>1</value>
-		</reference>
-		<output>
-			<property>/controls/flight/elevator-trim-cmd</property>
-		</output>
-		<config>
-			<Kp>-0.09</Kp>
-			<beta>1.0</beta>
-			<alpha>0.1</alpha>
-			<gamma>0.0</gamma>
-			<Ti>10</Ti>
-			<Td>0.00001</Td>
-			<u_min>-1.00</u_min>
-			<u_max>1.00</u_max>
-		</config>
-	</pid-controller>
-		
-	<filter>
-		<name>IT-FBW: PITCH TRIM FILTER</name>
-		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
-		<enable>
-			<condition>
-				<and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/ap1</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/output/ap2</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<equals>
-								<property>/it-fbw/law</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/it-fbw/law</property>
-								<value>1</value>
-							</equals>
-						</or>
-						<greater-than-equals>
-							<property>/position/gear-agl-ft</property>
-							<value>50</value>
-						</greater-than-equals>
-					</and>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<greater-than>
-							<property>/controls/flight/elevator-fbw</property>
-							<value>0.01</value>
-						</greater-than>
-						<less-than>
-							<property>/controls/flight/elevator-fbw</property>
-							<value>-0.01</value>
-						</less-than>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<property>/controls/flight/elevator-trim-cmd</property>
-		</input>
-		<output>/controls/flight/elevator-trim</output>
-		<type>noise-spike</type>
-		<max-rate-of-change>0.01</max-rate-of-change>
-	</filter>
-	
- <!-- =============================================================== -->
- <!-- Yaw Damper/Turn Coordinator                                     -->
- <!-- =============================================================== -->
-	
-	<pid-controller>
-		<name>IT-FBW: YAW DAMPER/TURN COORDINATOR</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/law</property>
-						<value>0</value>
-					</equals>
-					<greater-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</greater-than-equals>
-					<not-equals>
-						<property>/it-autoflight/output/lat</property>
-						<value>4</value>
-					</not-equals>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<property>/instrumentation/slip-skid-ball/indicated-slip-skid</property>
-		</input>
-		<reference>
-			<value>0</value>
-		</reference>
-		<output>
-			<property>/controls/flight/rudder-fbw-cmd</property>
-		</output>
-		<config>
-			<Kp>0.025</Kp>
-			<beta>1</beta>
-			<alpha>0.1</alpha>
-			<gamma>0</gamma>
-			<Ti>3.0</Ti>
-			<Td>0.00001</Td>
-			<u_min>-0.2</u_min>
-			<u_max>0.2</u_max>
-		</config>
-	</pid-controller>
-	
-	<filter>
-		<name>IT-FBW: RUDDER OPTION</name>
-		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/it-fbw/law</property>
-						<value>0</value>
-					</equals>
-					<less-than>
-						<property>/controls/flight/rudder</property>
-						<value>0.1</value>
-					</less-than>
-					<greater-than>
-						<property>/controls/flight/rudder</property>
-						<value>-0.1</value>
-					</greater-than>
-					<greater-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</greater-than-equals>
-					<not-equals>
-						<property>/it-autoflight/output/lat</property>
-						<value>4</value>
-					</not-equals>
-				</and>
-			</condition>
-			<property>/controls/flight/rudder-fbw-cmd</property>
-		</input>
-		<input>
-			<condition>
-				<or>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>1</value>
-					</equals>
-					<not-equals>
-						<property>/it-fbw/law</property>
-						<value>0</value>
-					</not-equals>
-					<greater-than-equals>
-						<property>/controls/flight/rudder</property>
-						<value>0.1</value>
-					</greater-than-equals>
-					<less-than-equals>
-						<property>/controls/flight/rudder</property>
-						<value>-0.1</value>
-					</less-than-equals>
-					<less-than>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</less-than>
-					<equals>
-						<property>/it-autoflight/output/lat</property>
-						<value>4</value>
-					</equals>
-				</or>
-			</condition>
-			<property>/controls/flight/rudder</property>
-		</input>
-		<output>/controls/flight/rudder-fbw</output>
-		<type>noise-spike</type>
-		<max-rate-of-change>2.5</max-rate-of-change>
-	</filter>
-
-</PropertyList>
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index 77925aef..1125ffec 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -1,140 +1,1299 @@
+<?xml version="1.0"?>
+
 <!-- Airbus A3XX FBW System by Joshua Davidson (it0uchpods) -->
+<!-- For Roll, Pitch, and Yaw -->
 
-<system name="it-fbw">
-	<property value="0">/it-fbw/law</property>
-	<property value="0">/it-fbw/roll-deg</property>
-	<property value="0">/it-fbw/pitch-deg</property>
-	<property value="33">/it-fbw/roll-lim-max</property>
-	<property value="-33">/it-fbw/roll-lim-min</property>
-	<property value="30">/it-fbw/pitch-lim-max</property>
-	<property value="-15">/it-fbw/pitch-lim-min</property>
-	<property value="0">/it-fbw/spd-hold</property>
+<PropertyList>
 
-	<channel name="FBW Aileron">
-		<fcs_function name="/it-fbw/roll-deg">
-			<function>
-				<ifthen>
-					<and>
-						<eq>
-							<property>/it-autoflight/output/ap1</property>
-							<value>0</value>
-						</eq>
-						<eq>
-							<property>/it-autoflight/output/ap2</property>
-							<value>0</value>
-						</eq>
-						<eq>
+
+ <!-- =============================================================== -->
+ <!-- Surface Position Feeding                                        -->
+ <!-- =============================================================== -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/aileron</input>
+		<output>/controls/flight/aileron-input-fast</output>
+		<max-rate-of-change>5</max-rate-of-change>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/elevator</input>
+		<output>/controls/flight/elevator-input-fast</output>
+		<max-rate-of-change>5</max-rate-of-change>
+	</filter>
+	
+
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/aileron</input>
+		<output>/controls/flight/aileron-input</output>
+		<max-rate-of-change>2.5</max-rate-of-change>
+	</filter>
+
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<less-than>
+						<property>/position/gear-agl-ft</property>
+						<value>50</value>
+					</less-than>
+					<greater-than-equals>
+						<property>/controls/flight/flap-pos</property>
+						<value>4</value>
+					</greater-than-equals>
+					<less-than>
+						<property>/controls/engines/engine[0]/throttle</property>
+						<value>0.65</value>
+					</less-than>
+					<less-than>
+						<property>/controls/engines/engine[1]/throttle</property>
+						<value>0.65</value>
+					</less-than>
+					<equals>
+						<property>/FMGC/status/to-state</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/law</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+				<sum>
+					<property>/controls/flight/elevator</property>
+					<value>0.15</value>
+				</sum>
+            </expression>
+		</input>
+		<input>
+			<property>/controls/flight/elevator</property>
+		</input>
+		<output>/controls/flight/elevator-input</output>
+		<max-rate-of-change>2.5</max-rate-of-change>
+	</filter>
+
+ <!-- =============================================================== -->
+ <!-- Lateral                                                         -->
+ <!-- =============================================================== -->
+ 
+    <filter>
+       <name>IT-CONTROLLER: ROLL</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-fbw/roll-lim</property>
+						<value>33</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/roll-back</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+				<sum>
+					<table>
+						<property>/controls/flight/aileron-input</property> 
+						<entry><ind>-1</ind><dep>-15.0</dep></entry>
+						<entry><ind> 0</ind><dep>  0.0</dep></entry>
+						<entry><ind> 1</ind><dep> 15.0</dep></entry>
+					</table>
+					<product>
+						<table>
+							<property>/orientation/roll-deg</property>
+							<entry><ind>-33.00000</ind><dep>1</dep></entry>
+							<entry><ind>-32.99999</ind><dep>0</dep></entry>
+						</table>
+						<table>
+							<property>/controls/flight/aileron-input</property> 
+							<entry><ind>-1</ind><dep>15.0</dep></entry>
+							<entry><ind> 0</ind><dep> 0.0</dep></entry>
+						</table>
+					</product>
+					<product>
+						<table>
+							<property>/orientation/roll-deg</property>
+							<entry><ind>32.99999</ind><dep>0</dep></entry>
+							<entry><ind>33.00000</ind><dep>1</dep></entry>
+						</table>
+						<table>
+							<property>/controls/flight/aileron-input</property> 
+							<entry><ind>0</ind><dep>  0.0</dep></entry>
+							<entry><ind>1</ind><dep>-15.0</dep></entry>
+						</table>
+					</product>
+				</sum>
+            </expression>
+        </input>
+        <input>
+			<condition>
+				<equals>
+					<property>/it-fbw/roll-lim</property>
+					<value>67</value>
+				</equals>
+			</condition>
+            <expression>
+				<sum>
+					<table>
+						<property>/controls/flight/aileron-input</property> 
+						<entry><ind>-1</ind><dep>-15.0</dep></entry>
+						<entry><ind> 0</ind><dep>  0.0</dep></entry>
+						<entry><ind> 1</ind><dep> 15.0</dep></entry>
+					</table>
+					<product>
+						<table>
+							<property>/orientation/roll-deg</property>
+							<entry><ind>-67.00000</ind><dep>1</dep></entry>
+							<entry><ind>-66.99999</ind><dep>0</dep></entry>
+						</table>
+						<table>
+							<property>/controls/flight/aileron-input</property> 
+							<entry><ind>-1</ind><dep>15.0</dep></entry>
+							<entry><ind> 0</ind><dep> 0.0</dep></entry>
+						</table>
+					</product>
+					<product>
+						<table>
+							<property>/orientation/roll-deg</property>
+							<entry><ind>66.99999</ind><dep>0</dep></entry>
+							<entry><ind>67.00000</ind><dep>1</dep></entry>
+						</table>
+						<table>
+							<property>/controls/flight/aileron-input</property> 
+							<entry><ind>0</ind><dep>  0.0</dep></entry>
+							<entry><ind>1</ind><dep>-15.0</dep></entry>
+						</table>
+					</product>
+				</sum>
+            </expression>
+        </input>
+        <input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-fbw/roll-back</property>
+						<value>1</value>
+					</equals>
+					<less-than>
+						<property>/controls/flight/aileron-input</property>
+						<value>0.05</value>
+					</less-than>
+					<greater-than>
+						<property>/controls/flight/aileron-input</property>
+						<value>-0.05</value>
+					</greater-than>
+				</and>
+			</condition>
+            <expression>
+				<table>
+					<property>/orientation/roll-deg</property>
+					<entry><ind>-67</ind><dep> 25.0</dep></entry>
+					<entry><ind>-40</ind><dep> 10.0</dep></entry>
+					<entry><ind>-33</ind><dep>  0.0</dep></entry>
+					<entry><ind> 33</ind><dep>  0.0</dep></entry>
+					<entry><ind> 40</ind><dep>-10.0</dep></entry>
+					<entry><ind> 67</ind><dep>-25.0</dep></entry>
+				</table>
+            </expression>
+        </input>
+		<output>/it-fbw/roll-rate</output>
+    </filter>
+	
+	<pid-controller>
+		<name>IT-FBW: ROLL</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/law</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<property>/orientation/roll-rate-degps</property>
+		</input>
+		<reference>
+			<property>/it-fbw/roll-rate</property>
+		</reference>
+		<output>
+			<property>/controls/flight/aileron-fbw-cmd</property>
+		</output>
+		<config>
+			<Kp>0.11</Kp>
+			<beta>1</beta>
+			<alpha>0.1</alpha>
+			<gamma>0</gamma>
+			<Ti>0.45</Ti>
+			<Td>0.002</Td>
+			<u_min>-1</u_min>
+			<u_max>1</u_max>
+		</config>
+	</pid-controller>
+	
+	<filter>
+		<name>IT-FBW: ROLL OPTION</name>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1</gain>
+		<feedback-if-disabled>true</feedback-if-disabled>
+		<initialize-to>output</initialize-to>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/law</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<property>/controls/flight/aileron-fbw-cmd</property>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<or>
+						<equals>
 							<property>/gear/gear[1]/wow</property>
-							<value>0</value>
-						</eq>
-						<eq>
+							<value>1</value>
+						</equals>
+						<equals>
 							<property>/gear/gear[2]/wow</property>
-							<value>0</value>
-						</eq>
-						<eq>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>2</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+			<property>/controls/flight/aileron-input</property>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<property>/controls/flight/aileron-fmgc</property>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/it-fbw/law</property>
+					<value>3</value>
+				</equals>
+			</condition>
+			<value>0</value>
+		</input>
+		<output>/controls/flight/roll-fbw</output>
+	</filter>
+	
+	<filter>
+		<name>IT-FBW: AILERON</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>/controls/flight/roll-fbw</input>
+		<output>/controls/flight/aileron-fbw</output>
+	</filter>
+	
+	<filter>
+		<name>IT-FBW: SPOILER</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/roll-back</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<product>
+					<property>/controls/flight/aileron-input</property>
+					<table>
+						<property>/instrumentation/airspeed-indicator/indicated-mach</property>
+						<entry><ind>0.2</ind><dep>1.00</dep></entry>
+						<entry><ind>0.9</ind><dep>0.25</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<expression>
+				<product>
+					<property>/controls/flight/aileron-fmgc</property>
+					<table>
+						<property>/instrumentation/airspeed-indicator/indicated-mach</property>
+						<entry><ind>0.2</ind><dep>1.00</dep></entry>
+						<entry><ind>0.9</ind><dep>0.25</dep></entry>
+					</table>
+				</product>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/roll-back</property>
+						<value>1</value>
+					</equals>
+				</and>
+			</condition>
+			<value>0</value>
+		</input>
+		<output>/controls/flight/spoiler-input</output>
+	</filter>
+	
+	<filter>
+		<name>IT-FBW: LEFT SPOILER</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-left</property>
+					<value>0</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/spoiler-input</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-left</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/roll-fbw</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/controls/flight/spoiler-left-fbw-cmd</output>
+		<min>-1</min>
+		<max>1</max>
+	</filter>
+	
+	<filter>
+		<name>IT-FBW: RIGHT SPOILER</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-right</property>
+					<value>0</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/spoiler-input</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-right</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/roll-fbw</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/controls/flight/spoiler-right-fbw-cmd</output>
+		<min>-1</min>
+		<max>1</max>
+	</filter>
+	
+ <!-- =============================================================== -->
+ <!-- Vertical                                                        -->
+ <!-- =============================================================== -->
+ 
+    <filter>
+       <name>IT-CONTROLLER: PITCH RATE CMD</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <input>
+			<condition>
+				<not-equals>
+					<property>/it-fbw/law</property>
+					<value>1</value>
+				</not-equals>
+			</condition>
+            <expression>
+				<sum>
+					<table>
+						<property>/controls/flight/elevator-input</property> 
+						<entry><ind> 1</ind><dep>-7.0</dep></entry>
+						<entry><ind> 0</ind><dep> 0.0</dep></entry>
+						<entry><ind>-1</ind><dep> 7.0</dep></entry>
+					</table>
+					<product>
+						<table>
+							<property>/orientation/pitch-deg</property>
+							<entry><ind>-15.00000</ind><dep>1</dep></entry>
+							<entry><ind>-14.99999</ind><dep>0</dep></entry>
+						</table>
+						<table>
+							<property>/controls/flight/elevator-input</property> 
+							<entry><ind>1</ind><dep>7.0</dep></entry>
+							<entry><ind>0</ind><dep>0.0</dep></entry>
+						</table>
+					</product>
+					<product>
+						<table>
+							<property>/orientation/pitch-deg</property>
+							<entry><ind>29.99999</ind><dep>0</dep></entry>
+							<entry><ind>30.00000</ind><dep>1</dep></entry>
+						</table>
+						<table>
+							<property>/controls/flight/elevator-input</property> 
+							<entry><ind> 0</ind><dep> 0.0</dep></entry>
+							<entry><ind>-1</ind><dep>-7.0</dep></entry>
+						</table>
+					</product>
+				</sum>
+            </expression>
+        </input>
+        <input>
+			<condition>
+				<equals>
+					<property>/it-fbw/law</property>
+					<value>1</value>
+				</equals>
+			</condition>
+            <expression>
+				<table>
+					<property>/controls/flight/elevator-input</property> 
+					<entry><ind> 1</ind><dep>-7.0</dep></entry>
+					<entry><ind> 0</ind><dep> 0.0</dep></entry>
+					<entry><ind>-1</ind><dep> 7.0</dep></entry>
+				</table>
+            </expression>
+        </input>
+		<output>/it-fbw/pitch-rate</output>
+    </filter>
+	
+	<pid-controller>
+		<name>IT-FBW: PITCH</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value> 
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/spd-hold</property>
+						<value>0</value>
+					</equals>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<equals>
 							<property>/it-fbw/law</property>
 							<value>0</value>
-						</eq>
-					</and>
-					<sum>
-						<property>/it-fbw/roll-deg</property>
-						<table>
-							<independentVar lookup="row">/controls/flight/aileron-input</independentVar>
-							<tableData>
-							-1.0     -0.1500
-							-0.7     -0.1000
-							-0.5     -0.0500
-							-0.3     -0.0270
-							-0.15    -0.0140
-							-0.05    -0.0055
-							 0.00     0.0000
-							 0.05     0.0055
-							 0.15     0.0140
-							 0.3      0.0270
-							 0.5      0.0500
-							 0.7      0.1000
-							 1.0      0.1500
-							</tableData>
-						</table>
-					</sum>
-					<property>/orientation/roll-deg</property>
-				</ifthen>
-			</function>
-			<clipto>
-				<min><property>/it-fbw/roll-lim-min</property></min>
-				<max><property>/it-fbw/roll-lim-max</property></max>
-			</clipto>
-		</fcs_function>
-	</channel>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<property>/orientation/pitch-rate-degps</property>
+		</input>
+		<reference>
+			<property>/it-fbw/pitch-rate</property>
+		</reference>
+		<output>
+			<property>/controls/flight/elevator-fbw-cmd</property>
+		</output>
+		<config>
+			<Kp>-0.20</Kp>
+			<beta>1</beta>
+			<alpha>0.1</alpha>
+			<gamma>0</gamma>
+			<Ti>0.45</Ti>
+			<Td>0.002</Td>
+			<u_min>-1</u_min>
+			<u_max>1</u_max>
+		</config>
+	</pid-controller>
 	
-	<channel name="FBW Elevator">
-		<fcs_function name="/it-fbw/pitch-deg">
-			<function>
-				<ifthen>
-					<and>
-						<eq>
-							<property>/it-autoflight/output/ap1</property>
+	<filter>
+		<name>IT-FBW: SPD PITCH TARGET CMD</name>
+		<type>noise-spike</type>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value> 
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/spd-hold</property>
+						<value>1</value>
+					</equals>
+					<or>
+						<equals>
+							<property>/it-fbw/law</property>
 							<value>0</value>
-						</eq>
-						<eq>
-							<property>/it-autoflight/output/ap2</property>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+		</enable>
+		<input> 
+			<expression>
+				<table>
+					<property>/controls/flight/elevator-input</property>
+					<entry><ind> 0</ind><dep>129</dep></entry>
+					<entry><ind>-1</ind><dep>106</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/it-fbw/spd-pitch-target</output>
+		<max-rate-of-change>10</max-rate-of-change>
+	</filter>
+	
+	<pid-controller>
+		<name>IT-FBW: SPD PITCH TARGET</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value> 
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/spd-hold</property>
+						<value>1</value>
+					</equals>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<equals>
+							<property>/it-fbw/law</property>
 							<value>0</value>
-						</eq>
-						<eq>
-							<property>/gear/gear[0]/wow</property>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
+		</input>
+		<reference>
+			<property>/it-fbw/spd-pitch-target</property>
+		</reference>
+		<output>
+			<property>/it-fbw/spd-pitch-deg</property>
+		</output>
+		<config>
+			<Kp>-0.50</Kp>
+			<beta>1.0</beta>    
+			<alpha>0.1</alpha>  
+			<gamma>0.0</gamma>  
+			<Ti>5.0</Ti>        
+			<Td>0.0001</Td>    
+			<u_min>-10</u_min>
+			<u_max>30</u_max>
+		</config>
+	</pid-controller>
+	
+	<pid-controller>
+		<name>IT-FBW: SPD PITCH</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value> 
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/spd-hold</property>
+						<value>1</value>
+					</equals>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<equals>
+							<property>/it-fbw/law</property>
 							<value>0</value>
-						</eq>
-						<eq>
-							<property>/it-fbw/spd-hold</property>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<property>/orientation/pitch-deg</property>
+		</input>
+		<reference>
+			<property>/it-fbw/spd-pitch-deg</property>
+		</reference>
+		<output>
+			<property>/controls/flight/elevator-fbw-cmd</property>
+		</output>
+		<config>
+			<Kp>-0.08</Kp>
+			<beta>1</beta>
+			<alpha>0.1</alpha>
+			<gamma>0</gamma>
+			<Ti>5</Ti>
+			<Td>0.001</Td>
+			<u_min>-1</u_min>
+			<u_max>1</u_max>
+		</config>
+	</pid-controller>
+	
+	<filter>
+		<name>IT-FBW: PITCH OPTION</name>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1</gain>
+		<feedback-if-disabled>true</feedback-if-disabled>
+		<initialize-to>output</initialize-to>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<equals>
+							<property>/it-fbw/law</property>
 							<value>0</value>
-						</eq>
-						<lt>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+			<property>/controls/flight/elevator-fbw-cmd</property>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>2</value>
+						</equals>
+						<greater-than-equals>
 							<property>/orientation/roll-deg</property>
 							<value>40</value>
-						</lt>
-						<gt>
+						</greater-than-equals>
+						<less-than-equals>
 							<property>/orientation/roll-deg</property>
 							<value>-40</value>
-						</gt>
+						</less-than-equals>
+					</or>
+				</and>
+			</condition>
+			<property>/controls/flight/elevator-input</property>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<property>/controls/flight/elevator-fmgc</property>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/it-fbw/law</property>
+					<value>3</value>
+				</equals>
+			</condition>
+			<value>0</value>
+		</input>
+		<output>/controls/flight/elevator-fbw</output>
+	</filter>
+	
+	<pid-controller>
+		<name>FBW PITCH HELPER PLUS</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<greater-than>
+						<property>/controls/flight/elevator-fbw</property>
+						<value>0.01</value>
+					</greater-than>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>0</value>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<greater-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>50</value>
+					</greater-than-equals>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<value>0</value>
+		</input>
+		<reference>
+			<value>1</value>
+		</reference>
+		<output>
+			<property>/controls/flight/elevator-trim-cmd</property>
+		</output>
+		<config>
+			<Kp>0.09</Kp>
+			<beta>1.0</beta>
+			<alpha>0.1</alpha>
+			<gamma>0.0</gamma>
+			<Ti>10</Ti>
+			<Td>0.00001</Td>
+			<u_min>-1.00</u_min>
+			<u_max>1.00</u_max>
+		</config>
+	</pid-controller>
+	
+	<pid-controller>
+		<name>FBW PITCH HELPER MINUS</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<less-than>
+						<property>/controls/flight/elevator-fbw</property>
+						<value>-0.01</value>
+					</less-than>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>0</value>
+					</equals>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>0</value>
+						</equals>
+						<equals>
+							<property>/it-fbw/law</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<greater-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>50</value>
+					</greater-than-equals>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<value>0</value>
+		</input>
+		<reference>
+			<value>1</value>
+		</reference>
+		<output>
+			<property>/controls/flight/elevator-trim-cmd</property>
+		</output>
+		<config>
+			<Kp>-0.09</Kp>
+			<beta>1.0</beta>
+			<alpha>0.1</alpha>
+			<gamma>0.0</gamma>
+			<Ti>10</Ti>
+			<Td>0.00001</Td>
+			<u_min>-1.00</u_min>
+			<u_max>1.00</u_max>
+		</config>
+	</pid-controller>
+		
+	<filter>
+		<name>IT-FBW: PITCH TRIM FILTER</name>
+		<debug>false</debug>
+		<feedback-if-disabled>true</feedback-if-disabled>
+		<initialize-to>output</initialize-to>
+		<enable>
+			<condition>
+				<and>
+					<and>
+						<equals>
+							<property>/it-autoflight/output/ap1</property>
+							<value>0</value>
+						</equals>
+						<equals>
+							<property>/it-autoflight/output/ap2</property>
+							<value>0</value>
+						</equals>
 						<or>
-							<eq>
+							<equals>
 								<property>/it-fbw/law</property>
 								<value>0</value>
-							</eq>
-							<eq>
+							</equals>
+							<equals>
 								<property>/it-fbw/law</property>
 								<value>1</value>
-							</eq>
+							</equals>
 						</or>
+						<greater-than-equals>
+							<property>/position/gear-agl-ft</property>
+							<value>50</value>
+						</greater-than-equals>
 					</and>
-					<sum>
-						<property>/it-fbw/pitch-deg</property>
-						<table>
-							<independentVar lookup="row">/controls/flight/elevator-input</independentVar>
-							<tableData>
-							-1.0      0.075
-							-0.7      0.053
-							-0.5      0.022
-							-0.3      0.0115
-							-0.15     0.0045
-							-0.05     0.0007
-							 0.00     0.0000
-							 0.05    -0.0007
-							 0.15    -0.0045
-							 0.3     -0.0115
-							 0.5     -0.022
-							 0.7     -0.053
-							 1.0     -0.075
-							</tableData>
-						</table>
-					</sum>
-					<property>/orientation/pitch-deg</property>
-				</ifthen>
-			</function>
-			<clipto>
-				<min><property>/it-fbw/pitch-lim-min</property></min>
-				<max><property>/it-fbw/pitch-lim-max</property></max>
-			</clipto>
-		</fcs_function>
-	</channel>
-</system>
+					<less-than>
+						<property>/orientation/roll-deg</property>
+						<value>40</value>
+					</less-than>
+					<greater-than>
+						<property>/orientation/roll-deg</property>
+						<value>-40</value>
+					</greater-than>
+					<or>
+						<greater-than>
+							<property>/controls/flight/elevator-fbw</property>
+							<value>0.01</value>
+						</greater-than>
+						<less-than>
+							<property>/controls/flight/elevator-fbw</property>
+							<value>-0.01</value>
+						</less-than>
+					</or>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<property>/controls/flight/elevator-trim-cmd</property>
+		</input>
+		<output>/controls/flight/elevator-trim</output>
+		<type>noise-spike</type>
+		<max-rate-of-change>0.01</max-rate-of-change>
+	</filter>
+	
+ <!-- =============================================================== -->
+ <!-- Yaw Damper/Turn Coordinator                                     -->
+ <!-- =============================================================== -->
+	
+	<pid-controller>
+		<name>IT-FBW: YAW DAMPER/TURN COORDINATOR</name>
+		<debug>false</debug>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/law</property>
+						<value>0</value>
+					</equals>
+					<greater-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>50</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/it-autoflight/output/lat</property>
+						<value>4</value>
+					</not-equals>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<property>/instrumentation/slip-skid-ball/indicated-slip-skid</property>
+		</input>
+		<reference>
+			<value>0</value>
+		</reference>
+		<output>
+			<property>/controls/flight/rudder-fbw-cmd</property>
+		</output>
+		<config>
+			<Kp>0.025</Kp>
+			<beta>1</beta>
+			<alpha>0.1</alpha>
+			<gamma>0</gamma>
+			<Ti>3.0</Ti>
+			<Td>0.00001</Td>
+			<u_min>-0.2</u_min>
+			<u_max>0.2</u_max>
+		</config>
+	</pid-controller>
+	
+	<filter>
+		<name>IT-FBW: RUDDER OPTION</name>
+		<debug>false</debug>
+		<feedback-if-disabled>true</feedback-if-disabled>
+		<initialize-to>output</initialize-to>
+		<input>
+			<condition>
+				<and>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-fbw/law</property>
+						<value>0</value>
+					</equals>
+					<less-than>
+						<property>/controls/flight/rudder</property>
+						<value>0.1</value>
+					</less-than>
+					<greater-than>
+						<property>/controls/flight/rudder</property>
+						<value>-0.1</value>
+					</greater-than>
+					<greater-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>50</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/it-autoflight/output/lat</property>
+						<value>4</value>
+					</not-equals>
+				</and>
+			</condition>
+			<property>/controls/flight/rudder-fbw-cmd</property>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>1</value>
+					</equals>
+					<not-equals>
+						<property>/it-fbw/law</property>
+						<value>0</value>
+					</not-equals>
+					<greater-than-equals>
+						<property>/controls/flight/rudder</property>
+						<value>0.1</value>
+					</greater-than-equals>
+					<less-than-equals>
+						<property>/controls/flight/rudder</property>
+						<value>-0.1</value>
+					</less-than-equals>
+					<less-than>
+						<property>/position/gear-agl-ft</property>
+						<value>50</value>
+					</less-than>
+					<equals>
+						<property>/it-autoflight/output/lat</property>
+						<value>4</value>
+					</equals>
+				</or>
+			</condition>
+			<property>/controls/flight/rudder</property>
+		</input>
+		<output>/controls/flight/rudder-fbw</output>
+		<type>noise-spike</type>
+		<max-rate-of-change>2.5</max-rate-of-change>
+	</filter>
+
+</PropertyList>