diff --git a/A319-200-IAE-set.xml b/A319-200-IAE-set.xml
index 533b3545..4b931297 100644
--- a/A319-200-IAE-set.xml
+++ b/A319-200-IAE-set.xml
@@ -8,8 +8,8 @@
 			<path>Aircraft/A320Family/Sounds/v2500-sound.xml</path>
 		</sound>
 	
-		<description>NOT READY: Airbus A319 (IAE V2500)</description>
-		<status>Not Flyable</status>
+		<description>Airbus A319 (IAE V2500)</description>
+		<status>Flyable</status>
 		<flight-model>jsb</flight-model>
 		<aero>A319-200-IAE</aero>
 		<model>
@@ -18,22 +18,14 @@
 				<file>USAirwaysStar</file>
 			</livery>
 		</model>
-
-		<flaps>
-			<setting>0.000</setting>
-			<setting>0.290</setting>
-			<setting>0.596</setting>
-			<setting>0.645</setting>
-			<setting>1.000</setting>
-		</flaps>
-
+		
 		<view>
 			<name>Pilot View</name>
 			<internal archive="y">true</internal>
 			<config>
 				<x-offset-m archive="y">-0.45</x-offset-m>
-				<y-offset-m archive="y">2.30</y-offset-m>
-				<z-offset-m archive="y">-12.00</z-offset-m>
+				<y-offset-m archive="y">2.25</y-offset-m>
+				<z-offset-m archive="y">-12.10</z-offset-m>
 				<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
 				<default-field-of-view-deg type="double">60</default-field-of-view-deg>
 			</config>
diff --git a/A319-200-IAE.xml b/A319-200-IAE.xml
index d76c0f9b..9d039825 100644
--- a/A319-200-IAE.xml
+++ b/A319-200-IAE.xml
@@ -7,7 +7,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <fileheader>
 	<author> Bicyus (Jon Ortuondo) </author>
 	<email> bicyus@gmail.com </email>
-	<filecreationdate> 2012-03-02 </filecreationdate>
+	<filecreationdate> 2012-02-15 </filecreationdate>
 	<version> 0.99 </version>
 	<description> Airbus A319-200 with IAE V2500 Engines </description>
 	<note> Revised and fixed by Peter Brendt (jwocky) and Joshua Davidson (it0uchpods). Fork from the A320-Family aircraft project (Thanks to all authors) </note>
@@ -23,21 +23,30 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<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> 642.122 </x>
-	<y> 0 </y>
-	<z> -25.2091 </z>
+		<x> 680.00 </x>
+		<y> 0 </y>
+		<z> 0.00 </z>
 	</location>
+
 	<location name="EYEPOINT" unit="IN">
-	<x> 80 </x>
-	<y> -30 </y>
-	<z> 70 </z>
+		<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>
+		<x> 661.1 </x>
+		<y> 0 </y>
+		<z> -37 </z>
 	</location>
+
 </metrics>
 
 <mass_balance>
@@ -64,107 +73,94 @@ YAW MOI_________3950000______23089847_______24848934
 	<ixy unit="SLUG*FT2">         0 </ixy>
 	<ixz unit="SLUG*FT2">         0 </ixz>
 	<iyz unit="SLUG*FT2">         0 </iyz>
-	<emptywt unit="LBS">77083</emptywt> <!-- #ref-12 page 54, WV009. 87579 bs - 5248x2 (engines)=77083lbs-->
+	<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> 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>
+		<x> 642.00 </x>
+		<y> 0 </y>
+		<z> 0.00 </z>
 	</location>
 
-	<pointmass name="Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 600lbs-->
+	<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="PAX">
-		<weight unit="LBS">19750</weight> <!-- MAX: 39500 lbs ** looks too heavy. maybe low it and give a long cilinder shape. need to do some maths-->
-		<form shape="cylinder">
-			<radius unit="M"> 2.13 </radius>
-			<length unit="M"> 24.44 </length>
-		</form>
+	<pointmass name="Cabin Crew">
+		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
 		<location name="POINTMASS" unit="IN">
-			<x>705</x>
+			<x>696</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
 	</pointmass>
-
-<!-- NEW Pointmasses Start Weights for good CG -->
-	<pointmass name="Fwd Cargo">
-		<weight unit="LBS">3750</weight> <!-- #REF-3 page 19, MAX 3402 kilograms = 7500.12616 lbs -->
-		<form shape="cylinder">
-			<radius unit="M"> 1.24 </radius>
-			<length unit="M"> 4.95 </length>
-		</form> 
-		<location name="POINTMASS" unit="IN"> 
-			<!-- #REF-1 page 88+98,
-			x= (door form nose(8.16m))-(door with(1.816m)/2)+(Cargo compartment lenght(4.953m)/2)
-			x= 9.7285 meters = 383.011811 in
-			-->
-			<x>383.01</x>
-			<y>0</y>
-			<z>-59.05</z> <!-- Aprox lower deck 1.5 meters = 59.0551181 in -->
-		</location>
-	</pointmass>
-
-	<pointmass name="Aft Cargo">
-		<weight unit="LBS">0</weight> <!-- #REF-3 page 19, MAX 4536 kilograms = 10000.1682 lbs -->
-		<form shape="cylinder">
-			<radius unit="M"> 1.24 </radius>
-			<length unit="M"> 6.6 </length>
-		</form> 
-		<location name="POINTMASS" unit="IN"> 
-			<!-- #REF-1 page 88+98,
-			x= (door form nose(22.69m))-(door with(1.816m)/2)
-			x= 21.78200 meters = 857.559055 in
-			-->
-			<x>857.55</x>
-			<y>0</y>
-			<z>-59.05</z> <!-- Aprox lower deck 1.5 meters = 59.0551181 in -->
-		</location>
-	</pointmass>
-	<pointmass name="Rear Bulk Cargo">
-		<weight unit="LBS">0</weight> <!-- #REF-3 page 19, MAX 1497 kilograms = 3300.32006 lbs -->
-		<form shape="cylinder">
-			<radius unit="M"> 1.24 </radius>
-			<length unit="M"> 2 </length>
-		</form> 
-		<location name="POINTMASS" unit="IN"> 
-			<!-- #REF-1 page 88+102,
-			x= (door form nose(22.69m))+(door with(1.816m)/2)+( Dist. between rear doors(2.19))+(Aprox to compartment center (2m))
-			x= 27.78800 meters = 1 094.01575 in
-			-->
-			<x>1094</x>
-			<y>0</y>
-			<z>-39.37</z> <!-- Aprox bulk lower deck 1 meter = 39.3700787 in -->
-		</location>
-	</pointmass>
-	<pointmass name="Engine1">
-		<weight unit="LBS">5248</weight>
-		<form shape="cylinder">
-			<radius unit="M"> 1.31 </radius>
-			<length unit="M"> 5 </length>
-		</form>
+	<pointmass name="PAX 0A (60 seats)">
+		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-45.567</z>
+			<x>470.1711</x>
+			<y>0</y>
+			<z>0</z>
 		</location>
 	</pointmass>
-	<pointmass name="Engine2">
-		<weight unit="LBS">5248</weight>
-		<form shape="cylinder">
-			<radius unit="M"> 1.31 </radius>
-			<length unit="M"> 5 </length>
-		</form>
+	<pointmass name="PAX 0B (60 seats)">
+		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-45.567</z>
+			<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>
 
@@ -172,7 +168,7 @@ YAW MOI_________3950000______23089847_______24848934
 </mass_balance>
 
 <ground_reactions>
-<!-- REF-1 page 165 + 271  -->
+	<!-- REF-1 page 165 + 271  -->
 	<contact type="BOGEY" name="NOSE_LG">
 		<location unit="IN">
 			<x> 197.6772 </x>
@@ -371,8 +367,8 @@ YAW MOI_________3950000______23089847_______24848934
 			<z> 47.4138 </z>
 		</location>
 		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_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>
@@ -386,8 +382,8 @@ YAW MOI_________3950000______23089847_______24848934
 			<z> 35.7926 </z>
 		</location>
 		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_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>
@@ -409,14 +405,13 @@ YAW MOI_________3950000______23089847_______24848934
 		<brake_group> NONE </brake_group>
 		<retractable>0</retractable>
 	</contact>
-
-</ground_reactions>	
-
+</ground_reactions>
 
 <propulsion>
-	<engine file="v2522_a5">
+
+	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 589.735 </x>
+		<x> 620.0683 </x>
 		<y> -226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -430,9 +425,9 @@ YAW MOI_________3950000______23089847_______24848934
 	<feed>2</feed>
 	<thruster file="direct">
 		<location unit="IN">
-		<x> 589.735 </x>
+		<x> 655.4820 </x>
 		<y> -226.575 </y>
-		<z> -45.567 </z>
+		<z> 0.000 </z>
 		</location>
 		<orient unit="DEG">
 		<roll> 0.0 </roll>
@@ -441,9 +436,10 @@ YAW MOI_________3950000______23089847_______24848934
 		</orient>
 	</thruster>
 	</engine>
-	<engine file="v2522_a5">
+
+	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 589.735 </x>
+		<x> 620.00683 </x>
 		<y> 226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -457,9 +453,9 @@ YAW MOI_________3950000______23089847_______24848934
 	<feed>4</feed>
 	<thruster file="direct">
 		<location unit="IN">
-		<x> 589.735 </x>
+		<x> 655.4820 </x>
 		<y> 226.575 </y>
-		<z> -45.567 </z>
+		<z> 0.000 </z>
 		</location>
 		<orient unit="DEG">
 		<roll> 0.0 </roll>
@@ -470,92 +466,91 @@ YAW MOI_________3950000______23089847_______24848934
 	</engine>
 
 
-	<tank type="FUEL">    <!-- Left Tank (Wing tip Ventilation Surge) -->
+	<tank type="FUEL">    <!-- Left Tank (Wing tip Ventilation Surge) 0 -->
 		<location unit="IN">
-			<x> 788.4322 </x>
+			<x> 783.0709 </x>
 			<y> -574.4148 </y>
 			<z> 3.1080 </z>
 		</location>
-		<capacity unit="LBS"> 328.13 </capacity><!-- need review -->
+		<capacity unit="LBS"> 150 </capacity><!-- need review -->
 		<contents unit="LBS"> 0 </contents>
 		
 		<priority>4</priority>
 		<type>JET-A1</type>
 		<temperature>50</temperature>
 	</tank>
-	<tank type="FUEL">    <!-- Left Tank (Outer) -->
+	<tank type="FUEL">    <!-- Left Tank (Outer) 1 -->
 		<location unit="IN">
-			<x> 737.4190 </x>
+			<x> 739.5669 </x>
 			<y> -457.4259 </y>
 			<z> -8.0898 </z>
 		</location>
-		<capacity unit="LBS"> 1548.8 </capacity><!-- need review -->
-		<contents unit="LBS"> 154.88 </contents>
+		<capacity unit="LBS"> 1520.00 </capacity><!-- need review -->
+		<contents unit="LBS"> 0 </contents>
 		<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) -->
+	<tank type="FUEL">    <!-- Left Tank (Inner) 2 -->
 		<location unit="IN">
-			<x> 630.6588 </x>
+			<x> 652.5591 </x>
 			<y> -236.2992 </y>
 			<z> -33.9470 </z>
 		</location>
-		<capacity unit="LBS"> 12186.9 </capacity><!-- need review -->
-		<contents unit="LBS"> 2437.38 </contents>
+		<capacity unit="LBS"> 11982 </capacity><!-- need review -->
+		<contents unit="LBS"> 3000 </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 -->
+	<tank type="FUEL">    <!-- Center Tank 3 -->
 		<location unit="IN">
-			<x> 580.9955 </x>
+			<x> 522.0473 </x>
 			<y> 0 </y>
 			<z> -47.0 </z>
 		</location>
-		<capacity unit="LBS"> 14520 </capacity><!-- need review -->
-		<contents unit="LBS"> 0 </contents>
+		<capacity unit="LBS"> 14281 </capacity><!-- need review -->
+		<contents unit="LBS"> 3000 </contents>
 		<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) -->
+	<tank type="FUEL">    <!-- Right Tank (Inner) 4 -->
 		<location unit="IN">
-			<x> 630.6588 </x>
+			<x> 652.5591 </x>
 			<y> 236.2992 </y>
 			<z> -33.9470 </z>
 		</location>
-		<capacity unit="LBS"> 12186.9 </capacity><!-- need review -->
-		<contents unit="LBS"> 2437.38 </contents>
-		<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+		<capacity unit="LBS"> 11982 </capacity><!-- need review -->
+		<contents unit="LBS"> 3000 </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) -->
+	<tank type="FUEL">    <!-- Right Tank (Outer) 5 -->
 		<location unit="IN">
-			<x> 737.4190 </x>
+			<x> 739.5669 </x>
 			<y> 457.4259 </y>
 			<z> -8.0898 </z>
 		</location>
-		<capacity unit="LBS"> 1548.8 </capacity><!-- need review -->
-		<contents unit="LBS"> 154.88 </contents>
+		<capacity unit="LBS"> 1520 </capacity><!-- need review -->
+		<contents unit="LBS"> 0 </contents>
 		<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) -->
+	<tank type="FUEL">    <!-- Right Tank (Wing tip Ventilation Surge) 6 -->
 		<location unit="IN">
-			<x> 788.4322 </x>
+			<x> 783.0709 </x>
 			<y> 574.4148 </y>
 			<z> 3.1080 </z>
 		</location>
-		<capacity unit="LBS"> 328.13 </capacity><!-- need review -->
+		<capacity unit="LBS"> 150 </capacity><!-- need review -->
 		<contents unit="LBS"> 0 </contents>
 		<priority>4</priority>
 		<type>JET-A1</type>
@@ -567,7 +562,7 @@ YAW MOI_________3950000______23089847_______24848934
 <!--system file="a320-fuel" /-->
 <system file="glass-effect1"/>
 
-<flight_control name="FCS: A319">
+<flight_control name="FCS: A320">
 	<channel name="Pitch">
 	<summer name="Pitch Trim Sum">
 		<input>/controls/flight/elevator</input>
@@ -724,99 +719,101 @@ YAW MOI_________3950000______23089847_______24848934
 		</range>
 		<output>fcs/rudder-pos-norm</output>
 	</aerosurface_scale> -->
-		<summer name="Rudder Command Sum">
-			<input>fcs/rudder-cmd-norm</input>
-			<input>fcs/yaw-trim-cmd-norm</input>
-			<clipto>
-				<min> -0.35 </min>
-				<max>  0.35 </max>
-			</clipto>
-		</summer>
+   <summer name="Rudder Command Sum">
+      <input>fcs/rudder-cmd-norm</input>
+      <input>fcs/yaw-trim-cmd-norm</input>
+      <clipto>
+        <min> -0.35 </min>
+        <max>  0.35 </max>
+      </clipto>
+   </summer>
 
-		<scheduled_gain name="Yaw Damper Rate">
-			<input>velocities/r-aero-rad_sec</input>
-			<table>
-				<independentVar lookup="row">velocities/ve-kts</independentVar>
-				<tableData>
-					30     0.00
-					60     2.00
-				</tableData>
-			</table>
-		</scheduled_gain>
+   <scheduled_gain name="Yaw Damper Rate">
+      <input>velocities/r-aero-rad_sec</input>
+      <table>
+        <independentVar lookup="row">velocities/ve-kts</independentVar>
+         <tableData>
+            30     0.00
+            60     2.00
+         </tableData>
+      </table>
+   </scheduled_gain>
 
-		<scheduled_gain name="Yaw Damper Beta">
-			<input>aero/beta-rad</input>
-			<table>
-				<independentVar lookup="row">velocities/ve-kts</independentVar>
-				<tableData>
-					30     0.00
-					60     0.00
-				</tableData>
-			</table>
-		</scheduled_gain>
+   <scheduled_gain name="Yaw Damper Beta">
+      <input>aero/beta-rad</input>
+      <table>
+        <independentVar lookup="row">velocities/ve-kts</independentVar>
+        <tableData>
+           30     0.00
+           60     0.00
+        </tableData>
+      </table>
+   </scheduled_gain>
 
-		<summer name="Yaw Damper Sum">
-			<input>fcs/yaw-damper-beta</input>
-			<input>fcs/yaw-damper-rate</input>
-			<clipto>
-				<min> -0.1 </min>
-				<max>  0.1 </max>
-			</clipto>
-		</summer>
+   <summer name="Yaw Damper Sum">
+      <input>fcs/yaw-damper-beta</input>
+      <input>fcs/yaw-damper-rate</input>
+      <clipto>
+        <min> -0.1 </min>
+        <max>  0.1 </max>
+      </clipto>
+   </summer>
 
-		<scheduled_gain name="Yaw Damper Final">
-			<input>fcs/yaw-damper-sum</input>
-			<table>
-				<independentVar lookup="row">velocities/ve-kts</independentVar>
-				<tableData>
-					30         0.0
-					31         1.0
-				</tableData>
-			</table>
-		</scheduled_gain>
+   <scheduled_gain name="Yaw Damper Final">
+      <input>fcs/yaw-damper-sum</input>
+      <table>
+        <independentVar lookup="row">velocities/ve-kts</independentVar>
+        <tableData>
+           30         0.0
+           31         1.0
+        </tableData>
+      </table>
+   </scheduled_gain>
 
-		<summer name="Rudder Sum">
-			<input>fcs/rudder-command-sum</input>
-			<input>fcs/yaw-damper-final</input>
-			<clipto>
-				<min> -1 </min>
-				<max>  1 </max>
-			</clipto>
-		</summer>
+   <summer name="Rudder Sum">
+      <input>fcs/rudder-command-sum</input>
+      <input>fcs/yaw-damper-final</input>
+      <clipto>
+        <min> -1 </min>
+        <max>  1 </max>
+      </clipto>
+   </summer>
 
-		<aerosurface_scale name="Rudder Control">
-			<input>fcs/rudder-sum</input>
-			<range>
-				<min> -0.35 </min>
-				<max>  0.35 </max>
-			</range>
-			<output>fcs/rudder-pos-rad</output>
-		</aerosurface_scale>
+   <aerosurface_scale name="Rudder Control">
+      <input>fcs/rudder-sum</input>
+      <range>
+        <min> -0.35 </min>
+        <max>  0.35 </max>
+      </range>
+      <output>fcs/rudder-pos-rad</output>
+   </aerosurface_scale>
 
-		<aerosurface_scale name="rudder normalization">
-			<input>fcs/rudder-pos-rad</input>
-			<domain>
-				<min> -0.35 </min>
-				<max>  0.35 </max>
-			</domain>
-			<range>
-				<min> -1 </min>
-				<max>  1 </max>
-			</range>
-			<output>fcs/rudder-pos-norm</output>
-		</aerosurface_scale>
+   <aerosurface_scale name="rudder normalization">
+      <input>fcs/rudder-pos-rad</input>
+      <domain>
+        <min> -0.35 </min>
+        <max>  0.35 </max>
+      </domain>
+      <range>
+        <min> -1 </min>
+        <max>  1 </max>
+      </range>
+      <output>fcs/rudder-pos-norm</output>
+   </aerosurface_scale>
 
 	</channel>
-	<channel name="Flaps">
+
+		<channel name="Flaps">
+
 		<kinematic name="Flaps Control">
-			<input>fcs/flap-cmd-norm</input>
+			<input>/controls/flight/flaps</input>
 			<traverse>
 			<setting>
 				<position>0</position>
 				<time>0</time>
 			</setting>
 			<setting>
-				<position>40</position>
+				<position>35</position>
 				<time>40</time>
 			</setting>
 			</traverse>
@@ -825,58 +822,94 @@ YAW MOI_________3950000______23089847_______24848934
 
 		<aerosurface_scale name="Flap position normalized">
 			<input>fcs/flap-pos-deg</input>
+			<domain>
+				<min>0</min>
+				<max>35</max>
+			</domain>
+			<range>
+				<min>0</min>
+				<max>1</max>
+			</range>
+			<output>fcs/flap-pos-norm</output>
+		</aerosurface_scale>
+
+	</channel>
+
+	<channel name="Slats">
+
+		<kinematic name="Slats Control">
+			<input>/controls/flight/slats</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>27</position>
+				<time>40</time>
+			</setting>
+			</traverse>
+			<output>fcs/slat-pos-deg</output>
+		</kinematic>
+
+		<aerosurface_scale name="Slat position normalized">
+			<input>fcs/slat-pos-deg</input>
 			<domain>
 			<min>0</min>
-			<max>40</max>
+			<max>27</max>
 			</domain>
 			<range>
 			<min>0</min>
 			<max>1</max>
 			</range>
-			<output>fcs/flap-pos-norm</output>
+			<output>fcs/slat-pos-norm</output>
 		</aerosurface_scale>
+
 	</channel>
+
 	<channel name="Landing Gear">
-	<kinematic name="Gear Control">
-		<input>gear/gear-cmd-norm</input>
-		<traverse>
-		<setting>
-			<position>0</position>
-			<time>0</time>
-		</setting>
-		<setting>
-			<position>1</position>
-			<time>10</time>
-		</setting>
-		</traverse>
-		<output>gear/gear-pos-norm</output>
-	</kinematic>
+
+		<kinematic name="Gear Control">
+			<input>gear/gear-cmd-norm</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>1</position>
+				<time>10</time>
+			</setting>
+			</traverse>
+			<output>gear/gear-pos-norm</output>
+		</kinematic>
 	</channel>
+
 	<channel name="Speedbrake">
-	<kinematic name="Speedbrake">
-		<input>fcs/speedbrake-cmd-norm</input>
-		<traverse>
-		<setting>
-			<position>0</position>
-			<time>0</time>
-		</setting>
-		<setting>
-			<position>1</position>
-			<time>2</time>
-		</setting>
-		</traverse>
-		<output>fcs/speedbrake-pos-norm</output>
-	</kinematic>
+		<kinematic name="Speedbrake">
+			<input>fcs/speedbrake-cmd-norm</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>1</position>
+				<time>2</time>
+			</setting>
+			</traverse>
+			<output>fcs/speedbrake-pos-norm</output>
+		</kinematic>
 	</channel>
     
-    <channel name="Tiller">
+	<channel name="Tiller">
 		
 		<switch name="/controls/gear/tiller-disabled">
-            <default value="0"/>
-            <test logic="AND" value="1">
-                /controls/gear/tiller-enabled == 0
-            </test>
-        </switch>
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/controls/gear/tiller-enabled == 0
+			</test>
+		</switch>
         
         <fcs_function name="Nose Wheel Steering 0">
             <function name="fcs/steer-nose-deg[0]">
@@ -914,678 +947,372 @@ YAW MOI_________3950000______23089847_______24848934
         </actuator>
         
     </channel>
+
     
 </flight_control>
 
 
-<aerodynamics>
-	<function name="aero/function/kCDge">
-		<description>Change_in_drag_due_to_ground_effect</description>
-		<product>
-			<table>
-				<independentVar>aero/h_b-mac-ft</independentVar>
-				<tableData>
-					0.0000	0.4800
-					0.1000	0.5150
-					0.1500	0.6290
-					0.2000	0.7090
-					0.3000	0.8150
-					0.4000	0.8820
-					0.5000	0.9280
-					0.6000	0.9620
-					0.7000	0.9880
-					0.8000	1.0000
-					0.9000	1.0000
-					1.0000	1.0000
-					1.1000	1.0000
-				</tableData>
-			</table>
-		</product>
-	</function>
-	<function name="aero/function/kCLge">
-		<description>Change_in_lift_due_to_ground_effect</description>
-		<product>
-			<table>
-				<independentVar>aero/h_b-mac-ft</independentVar>
-				<tableData>
-					0.0000	1.2030
-					0.1000	1.1270
-					0.1500	1.0900
-					0.2000	1.0730
-					0.3000	1.0460
-					0.4000	1.0550
-					0.5000	1.0190
-					0.6000	1.0130
-					0.7000	1.0080
-					0.8000	1.0060
-					0.9000	1.0030
-					1.0000	1.0020
-					1.1000	1.0000
-				</tableData>
-			</table>
-		</product>
-	</function>
-  	<axis name="LIFT">
-		<function name="aero/force/Lift_gain">
-			<description>Added_lift</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<value>0.30</value>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/CLalpha">
-			<description>Lift_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	9.0000	10.0000	40.0000
-				-0.0900	-0.2200	-0.2200	-0.1200	-0.1200	0.3200
-				0.0000	0.2500	0.2500	0.3500	0.3500	0.7500
-				0.0900	0.7300	0.7300	0.8300	0.8300	1.2300
-				0.1000	0.8300	0.8300	0.9300	0.9300	1.3300
-				0.1200	0.9200	0.9200	1.0200	1.0200	1.4200
-				0.1400	1.0200	1.0200	1.1200	1.1200	1.5200
-				0.1600	1.0800	1.0800	1.1800	1.1800	1.5800
-				0.1700	1.1300	1.1300	1.2300	1.2300	1.6300
-				0.1900	1.1900	1.1900	1.2900	1.2900	1.6900
-				0.2100	1.2500	1.2500	1.3500	1.3500	1.7700
-				0.2400	1.3500	1.3700	1.4700	1.4800	1.9300
-				0.2600	1.4400	1.4700	1.5700	1.6200	2.1200
-				0.2800	1.4700	1.5100	1.6100	1.7800	2.4000
-				0.3000	1.5000	1.5600	1.6600	1.9000	2.3000
-				0.3200	1.4700	1.6100	1.6000	1.7000	2.0300
-				0.3400	1.3500	1.5000	1.4100	1.5000	1.5300
-				0.3600	1.1500	1.2000	1.2000	1.2000	1.2000
-				</tableData>
-			</table>
-			</product>
-		</function-->
+	<aerodynamics>
 
-		<function name="aero/force/Lift_alpha">
-			<description>Lift_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>aero/function/kCLge</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	9.0000	10.0000	40.0000
-				-0.0900	-0.2200	-0.2200	-0.1200	-0.1200	0.2500
-				0.0000	0.2500	0.2500	0.3500	0.3500	0.7500
-				0.0900	0.7300	0.7300	0.8300	0.8300	1.2300
-				0.1000	0.8300	0.8300	0.9300	0.9300	1.3300
-				0.1200	0.9200	0.9200	1.0200	1.0200	1.4200
-				0.1400	1.0200	1.0200	1.1200	1.1200	1.5200
-				0.1600	1.0800	1.0800	1.1800	1.1800	1.5800
-				0.1700	1.1300	1.1300	1.2300	1.2300	1.6300
-				0.1900	1.1900	1.1900	1.2900	1.2900	1.6900
-				0.2100	1.2500	1.2500	1.3500	1.3500	1.7700
-				0.2400	1.3500	1.3700	1.4700	1.4800	1.9300
-				0.2600	1.4400	1.4700	1.5700	1.6200	2.1200
-				0.2800	1.4700	1.5100	1.6100	1.7800	2.4000
-				0.3000	1.5000	1.5600	1.6600	1.9000	2.3000
-				0.3200	1.4700	1.6100	1.6000	1.7000	2.0300
-				0.3400	1.3500	1.5000	1.4100	1.5000	1.5300
-				0.3600	1.1500	1.2000	1.2000	1.2000	1.2000
-				</tableData>
-			</table>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/CLDe">
-			<description>Lift_due_to_Elevator_Deflection</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>fcs/elevator-pos-rad</property>
-			<value>0.1930</value>
-			</product>
-		</function>-->
-		<function name="aero/force/Lift_elevator">
-			<description>Lift due to Elevator Deflection</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/elevator-pos-rad</property>
-				<value>0.1930</value>
-			</product>
-		</function>
+		<axis name="LIFT">
 
-
-
-		<function name="aero/force/Lift_speedbrake">
-			<description>Delta Lift due to speedbrake</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/speedbrake-pos-norm</property>
-				<value>-0.15</value>
-			</product>
-		</function>
-
-
-  </axis>
-
-  <axis name="DRAG">
-
-		<function name="aero/force/Drag_zero_lift">
-			<description>Drag_at_zero_lift</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<value>0.016</value>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/CDalpha">
-			<description>Drag_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	25.0000	40.0000
-				-0.0873	0.0041	0.0000	0.0005	0.0014
-				-0.0698	0.0013	0.0004	0.0025	0.0041
-				-0.0524	0.0001	0.0023	0.0059	0.0084
-				-0.0349	0.0003	0.0057	0.0108	0.0141
-				-0.0175	0.0020	0.0105	0.0172	0.0212
-				0.0000	0.0052	0.0168	0.0251	0.0399
-				0.0175	0.0099	0.0248	0.0346	0.0502
-				0.0349	0.0162	0.0342	0.0457	0.0621
-				0.0524	0.0240	0.0452	0.0583	0.0755
-				0.0698	0.0334	0.0577	0.0724	0.0904
-				0.0873	0.0442	0.0718	0.0881	0.1068
-				0.1047	0.0566	0.0874	0.1053	0.1248
-				0.1222	0.0706	0.1045	0.1240	0.1443
-				0.1396	0.0860	0.1232	0.1442	0.1654
-				0.1571	0.0962	0.1353	0.1573	0.1790
-				0.1745	0.1069	0.1479	0.1708	0.1930
-				0.1920	0.1180	0.1610	0.1849	0.2075
-				0.2094	0.1298	0.1746	0.1995	0.2226
-				0.2269	0.1424	0.1892	0.2151	0.2386
-				0.2443	0.1565	0.2054	0.2323	0.2564
-				0.2618	0.1727	0.2240	0.2521	0.2767
-				0.2793	0.1782	0.2302	0.2587	0.2835
-				0.2967	0.1716	0.2227	0.2507	0.2753
-				0.3142	0.1618	0.2115	0.2388	0.2631
-				0.3316	0.1475	0.1951	0.2214	0.2451
-				0.3491	0.1097	0.1512	0.1744	0.1966
-				</tableData>
-			</table>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_alpha">
-			<description>Drag_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	25.0000	40.0000
-				-0.0873	0.0041	0.0000	0.0005	0.0014
-				-0.0698	0.0013	0.0004	0.0025	0.0041
-				-0.0524	0.0001	0.0023	0.0059	0.0084
-				-0.0349	0.0003	0.0057	0.0108	0.0141
-				-0.0175	0.0020	0.0105	0.0172	0.0212
-				0.0000	0.0052	0.0168	0.0251	0.0399
-				0.0175	0.0099	0.0248	0.0346	0.0502
-				0.0349	0.0162	0.0342	0.0457	0.0621
-				0.0524	0.0240	0.0452	0.0583	0.0755
-				0.0698	0.0334	0.0577	0.0724	0.0904
-				0.0873	0.0442	0.0718	0.0881	0.1068
-				0.1047	0.0566	0.0874	0.1053	0.1248
-				0.1222	0.0706	0.1045	0.1240	0.1443
-				0.1396	0.0860	0.1232	0.1442	0.1654
-				0.1571	0.0962	0.1353	0.1573	0.1790
-				0.1745	0.1069	0.1479	0.1708	0.1930
-				0.1920	0.1180	0.1610	0.1849	0.2075
-				0.2094	0.1298	0.1746	0.1995	0.2226
-				0.2269	0.1424	0.1892	0.2151	0.2386
-				0.2443	0.1565	0.2054	0.2323	0.2564
-				0.2618	0.1727	0.2240	0.2521	0.2767
-				0.2793	0.1782	0.2302	0.2587	0.2835
-				0.2967	0.1716	0.2227	0.2507	0.2753
-				0.3142	0.1618	0.2115	0.2388	0.2631
-				0.3316	0.1475	0.1951	0.2214	0.2451
-				0.3491	0.1097	0.1512	0.1744	0.1966
-				</tableData>
-			</table>
-			</product>
-		</function>
-
-   
-		<!--function name="aero/coefficient/CDde">
-			<description>Drag_due_to_elevator_Deflection</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/mag-elevator-pos-rad</property>
-				<value>0.0500</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_elevator">
-			<description>Drag due to Elevator Deflection</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<abs><property>fcs/elevator-pos-norm</property></abs>
-				<value>0.055</value>
-			</product>
-		</function>
-
-
-		<!--function name="aero/coefficient/CDbeta">
-			<description>Drag_due_to_sideslip</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>aero/mag-beta-rad</property>
-			<value>0.2000</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_beta">
-			<description>Drag_due_to_sideslip</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>aero/mag-beta-rad</property>
-				<value>0.2000</value>
-			</product>
-		</function>
-
-
-		<!--function name="aero/coefficient/CDgear">
-			<description>Drag_due_to_landing_gear</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>gear/gear-pos-norm</property>
-			<value>0.0400</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_gear">
-			<description>Drag due to gear</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>gear/gear-pos-norm</property>
-				<value>0.04</value>
-			</product>
-		</function>
-
-		<!--function name="aero/coefficient/CDspeedbrake">
-			<description>Drag_due_to_speedbrake</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>fcs/speedbrake-pos-norm</property>
-			<value>0.0400</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_speedbrake">
-			<description>Drag due to speedbrakes</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/speedbrake-pos-norm</property>
-				<value>0.08</value>
-			</product>
-		</function>
-
-		<!--function name="aero/coefficient/CDo">
-			<description>Drag_at_zero_lift</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<value>0.016</value>
-			</product>
-		</function-->
-
-		<function name="aero/force/Drag_mach">
-			<description>Drag due to mach</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<table>
-					<independentVar lookup="row">velocities/mach</independentVar>
+			<function name="aero/force/Lift_alpha">
+				<description>Lift due to alpha</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">aero/alpha-rad</independentVar>
 						<tableData>
-						0.00      0.000
-						0.79      0.000
-						1.10      0.023
-						1.80      0.015
+							-0.20 -0.780
+							 0.00  0.345
+							 0.23  1.100
+							 0.60  0.700
 						</tableData>
-				</table>
-			</product>
-		</function>
+					</table>
+				</product>
+			</function>
 
-  </axis>
+			<function name="aero/force/Lift_flap">
+				<description>Delta Lift due to flaps</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/flap-pos-deg</property>
+					<value> 0.00700 </value>
+				</product>
+			</function>
 
-  <axis name="SIDE">
-		<!-- function name="aero/coefficient/CYb">
-			<description>Side_force_due_to_beta</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar>aero/beta-rad</independentVar>
-				<tableData>
-				-0.3500	0.5000
-				0.0000	0.0000
-				0.3500	-0.5000
-				</tableData>
-			</table>
-			</product>
-		</function -->
-		<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/Lift_slats">
+				<description>Delta Lift due to slats</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/slat-pos-deg</property>
+					<value> 0.02000 </value>
+				</product>
+			</function>
 
-  </axis>
+			<function name="aero/force/Lift_speedbrake">
+				<description>Delta Lift due to speedbrake</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/speedbrake-pos-norm</property>
+					<value>-0.1</value>
+				</product>
+			</function>
 
-  <axis name="ROLL">
-		<!--function name="aero/coefficient/Clb">
-			<description>Roll_moment_due_to_beta</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<table>
-				<independentVar>aero/beta-rad</independentVar>
-				<tableData>
-				-0.3500	0.0100
-				0.0000	0.0000
-				0.3500	-0.0100
-				</tableData>
-			</table>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_beta">
-			<description>Roll moment due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/beta-rad</property>
-				<value>-0.1</value>
-			</product>
-		</function>
+			<function name="aero/force/Lift_elevator">
+				<description>Lift due to Elevator Deflection</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/elevator-pos-rad</property>
+					<value>0.15</value>
+				</product>
+			</function>
 
+		</axis>
 
-		<!--function name="aero/coefficient/Clp">
-			<description>Roll_moment_due_to_roll_rate_(roll_damping)</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/bi2vel</property>
-			<property>velocities/p-aero-rad_sec</property>
-			<value>-0.5000</value>
-			</product>
-		</function-->
+		<axis name="DRAG">
 
-		<function name="aero/moment/Roll_damp">
-			<description>Roll moment due to roll rate</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/bi2vel</property>
-				<property>velocities/p-aero-rad_sec</property>
-				<value>-0.4</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_basic">
+				<description>Drag at zero lift</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">aero/alpha-rad</independentVar>
+						<tableData>
+							-1.57    1.300
+							-0.26    0.021
+							 0.00    0.012
+							 0.26    0.021
+							 1.57    1.300
+						</tableData>
+					</table>
+				</product>
+			</function>
 
+			<function name="aero/force/Drag_induced">
+				<description>Induced drag</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>aero/cl-squared</property>
+					<value>0.041</value>
+				</product>
+			</function>
 
-		<!--function name="aero/coefficient/Clr">
-			<description>Roll_moment_due_to_yaw_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/bi2vel</property>
-			<property>velocities/r-aero-rad_sec</property>
-			<value>0.0050</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_yaw">
-			<description>Roll moment due to yaw rate</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/bi2vel</property>
-				<property>velocities/r-aero-rad_sec</property>
-				<value>0.005</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_mach">
+				<description>Drag due to mach</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">velocities/mach</independentVar>
+						<tableData>
+							 0.00      0.000
+							 0.79      0.000
+							 1.10      0.023
+							 1.80      0.015
+						</tableData>
+					</table>
+				</product>
+			</function>
 
+			<function name="aero/force/Drag_flap">
+				<description>Drag due to flaps</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/flap-pos-deg</property>
+					<value> 0.00120 </value>
+				</product>
+			</function>
 
-		<!--function name="aero/coefficient/Clda">
-			<description>Roll_moment_due_to_aileron</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>fcs/left-aileron-pos-rad</property>
-			<!- value>0.2000</value -> <!- Excesive roll !!! ->
+			<function name="aero/force/Drag_slats">
+				<description>Drag due to slats</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/flap-pos-deg</property>
+					<value> 0.00120 </value>
+				</product>
+			</function>
 
-			<table>
-				<independentVar lookup="row">velocities/mach</independentVar>
-					<tableData>
-						0.0    0.100
-						2.0    0.033
-					</tableData>
-			</table>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_aileron">
-			<description>Roll moment due to aileron</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>fcs/left-aileron-pos-rad</property>
-				<table>
-					<independentVar lookup="row">velocities/mach</independentVar>
-					<tableData>
-						0.0    0.100
-						2.0    0.033
-					</tableData>
-				</table>
-			</product>
-		</function>
+			<function name="aero/force/Drag_gear">
+				<description>Drag due to gear</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>gear/gear-pos-norm</property>
+					<value>0.020</value>
+				</product>
+			</function>
 
-		<!--function name="aero/coefficient/Cldr">
-			<description>Roll_moment_due_to_rudder</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>fcs/rudder-pos-rad</property>
-			<value>0.0050</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_rudder">
-			<description>Roll moment due to rudder</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>fcs/rudder-pos-rad</property>
-				<value>0.005</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_speedbrake">
+				<description>Drag due to speedbrakes</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/speedbrake-pos-norm</property>
+					<value>0.02</value>
+				</product>
+			</function>
 
-	</axis>
+			<function name="aero/force/Drag_beta">
+				<description>Drag due to sideslip</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">aero/beta-rad</independentVar>
+						<tableData>
+							-1.57    1.230
+							-0.26    0.050
+							 0.00    0.000
+							 0.26    0.050
+							 1.57    1.230
+						</tableData>
+					</table>
+				</product>
+			</function>
 
-	<axis name="PITCH">
-		<function name="aero/moment/Pitch_zero_alpha_and_flaps">
-			<description>Pitching_moment_at_zero_alpha</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/cbarw-ft</property>
-				<table>
-					<independentVar>fcs/flap-pos-deg</independentVar>
-					<tableData>
-					0.0000	0.0000
-					40.0000	-0.1000
-					</tableData>
-				</table>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_alpha">
-			<description>Pitch_moment_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>aero/alpha-rad</property>
-			<!-- value>-4.0000</value> -->
-			<value>-0.6</value>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_elevator">
-			<description>Pitch_moment_due_to_elevator_Deflection</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>fcs/elevator-pos-rad</property>
-			<!-- <value>-1.5000</value>  Excesive Pitch -->
-			<table>
-				<independentVar lookup="row">velocities/mach</independentVar>
-				<tableData>
-					0.0     -1.200
-					2.0     -0.300
-				</tableData>
-			</table>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_damp">
-			<description>Pitch_moment_due_to_pitch_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>aero/ci2vel</property>
-			<property>velocities/q-aero-rad_sec</property>
-			<!--value>-10.0000</value-->
-			<value>-10</value>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_alpha_rate">
-			<description>Pitch_moment_due_to_alpha_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>aero/ci2vel</property>
-			<property>aero/alphadot-rad_sec</property>
-			<!--value>-12.0000</value-->
-			<value>-12</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_elevator">
+				<description>Drag due to Elevator Deflection</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<abs><property>fcs/elevator-pos-norm</property></abs>
+					<value>0.045</value>
+				</product>
+			</function>
 
-	</axis>
+		</axis>
 
-	<axis name="YAW">
-		<!--function name="aero/coefficient/Cnr">
-			<description>Yaw_moment_due_to_yaw_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/bi2vel</property>
-			<property>velocities/r-aero-rad_sec</property>
-			<value>-0.0400</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Yaw_damp">
-			<description>Yaw moment due to yaw rate</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/bi2vel</property>
-				<property>velocities/r-aero-rad_sec</property>
-				<value>-0.15</value>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/Cnb">
-			<description>Yaw_moment_due_to_beta</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/beta-rad</property>
-			<value>0.2000</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Yaw_beta">
-			<description>Yaw moment due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/beta-rad</property>
-				<value>0.12</value>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/Cndr">
-			<description>Yaw_moment_due_to_rudder</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>fcs/rudder-pos-rad</property>
-			<!- <value>-0.5000</value> Excesive Yaw->
-			<value>-0.3</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Yaw_rudder">
-			<description>Yaw moment due to rudder</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>fcs/rudder-pos-rad</property>
-				<value>-0.2</value>
-			</product>
-		</function>
+		<axis name="SIDE">
 
-    <!--function name="aero/moment/Yaw_aileron">
-       <description>Adverse yaw</description>
-       <product>
-           <property>aero/qbar-psf</property>
-           <property>metrics/Sw-sqft</property>
-           <property>metrics/bw-ft</property>
-           <property>fcs/left-aileron-pos-rad</property>
-           <value>0</value>
-       </product>
-    </function-->
+			<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">
 
-	</axis>
+			<function name="aero/moment/Roll_beta">
+				<description>Roll moment due to beta</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/beta-rad</property>
+					<value>-0.1</value>
+				</product>
+			</function>
 
-</aerodynamics>
+			<function name="aero/moment/Roll_damp">
+				<description>Roll moment due to roll rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/bi2vel</property>
+					<property>velocities/p-aero-rad_sec</property>
+					<value>-0.4</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Roll_yaw">
+				<description>Roll moment due to yaw rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/bi2vel</property>
+					<property>velocities/r-aero-rad_sec</property>
+					<value>0.15</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Roll_aileron">
+				<description>Roll moment due to aileron</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/left-aileron-pos-rad</property>
+					<value>0.1</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Roll_rudder">
+				<description>Roll moment due to rudder</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/rudder-pos-rad</property>
+					<value>0.01</value>
+				</product>
+			</function>
+
+		</axis>
+
+		<axis name="PITCH">
+
+			<function name="aero/moment/Pitch_alpha">
+				<description>Pitch moment due to alpha</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>aero/alpha-rad</property>
+					<value>-0.6</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Pitch_elevator">
+				<description>Pitch moment due to elevator</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>fcs/elevator-pos-rad</property>
+					<table>
+						<independentVar lookup="row">velocities/mach</independentVar>
+						<tableData>
+							0.0     -1.200
+							2.0     -0.300
+						</tableData>
+					</table>
+				</product>
+			</function>
+
+			<function name="aero/moment/Pitch_damp">
+				<description>Pitch moment due to pitch rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>aero/ci2vel</property>
+					<property>velocities/q-aero-rad_sec</property>
+					<value>-17</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Pitch_alphadot">
+				<description>Pitch moment due to alpha rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>aero/ci2vel</property>
+					<property>aero/alphadot-rad_sec</property>
+					<value>-6</value>
+				</product>
+			</function>
+
+		</axis>
+
+		<axis name="YAW">
+
+			<function name="aero/moment/Yaw_beta">
+				<description>Yaw moment due to beta</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/beta-rad</property>
+					<value>0.12</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Yaw_damp">
+				<description>Yaw moment due to yaw rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/bi2vel</property>
+					<property>velocities/r-aero-rad_sec</property>
+					<value>-0.15</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Yaw_rudder">
+				<description>Yaw moment due to rudder</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/rudder-pos-rad</property>
+					<value>-0.1</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Yaw_aileron">
+				<description>Adverse yaw</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/left-aileron-pos-rad</property>
+					<value>0</value>
+				</product>
+			</function>
+
+		</axis>
+
+	</aerodynamics>
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index 75b07ab9..f8e6173f 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -8,8 +8,8 @@
 			<path>Aircraft/A320Family/Sounds/v2500-sound.xml</path>
 		</sound>
 	
-		<description>NOT READY: Airbus A321 (IAE V2500)</description>
-		<status>Not Flyable</status>
+		<description>Airbus A321 (IAE V2500)</description>
+		<status>Flyable</status>
 		<flight-model>jsb</flight-model>
 		<aero>A321-200-IAE</aero>
 		<model>
@@ -19,21 +19,13 @@
 			</livery>
 		</model>
 
-		<flaps>
-			<setting>0.000</setting>
-			<setting>0.290</setting>
-			<setting>0.596</setting>
-			<setting>0.645</setting>
-			<setting>1.000</setting>
-		</flaps>
-
 		<view>
 			<name>Pilot View</name>
 			<internal archive="y">true</internal>
 			<config>
 				<x-offset-m archive="y">-0.45</x-offset-m>
-				<y-offset-m archive="y">2.30</y-offset-m>
-				<z-offset-m archive="y">-17.87</z-offset-m>
+				<y-offset-m archive="y">2.25</y-offset-m>
+				<z-offset-m archive="y">-18.05</z-offset-m>
 				<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
 				<default-field-of-view-deg type="double">60</default-field-of-view-deg>
 			</config>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index 66ec0887..a59bcf61 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -7,15 +7,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 <fileheader>
 	<author> Bicyus (Jon Ortuondo) </author>
 	<email> bicyus@gmail.com </email>
-	<filecreationdate> 2012-02-22 </filecreationdate>
+	<filecreationdate> 2012-02-15 </filecreationdate>
 	<version> 0.99 </version>
-	<description> Airbus A320-200 with IAE V2500 Engines </description>
+	<description> Airbus A321-200 with IAE V2500 Engines </description>
 	<note> Revised and fixed by Peter Brendt (jwocky) and Joshua Davidson (it0uchpods). Fork from the A320-Family aircraft project (Thanks to all authors) </note>
 	<limitation></limitation>
 </fileheader>
 
 <metrics>
-	<!-- lenght 44.50 m -->
 	<wingarea  unit="FT2"> 1319.79 </wingarea>
 	<wingspan  unit="FT" >  111.26 </wingspan>
 	<wing_incidence>          1.03 </wing_incidence>
@@ -24,27 +23,36 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<htailarm  unit="FT" >   57.88 </htailarm>
 	<vtailarea unit="FT2">  248.79 </vtailarea>
 	<vtailarm  unit="FT" >   57.33 </vtailarm>
-	<location name="AERORP" unit="IN">
+
+	<!-- location name="AERORP" unit="IN">
 		<x> 642.122 </x>
 		<y> 0 </y>
 		<z> -25.2091 </z>
+	</location -->
+	<location name="AERORP" unit="IN">
+		<x> 680.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="VRP" unit="IN">
 		<x> 661.1 </x>
 		<y> 0 </y>
 		<z> -37 </z>
 	</location>
+
 </metrics>
 
 <mass_balance>
-	<!--ixx unit="SLUG*FT2">    611903 </ixx>
+	<ixx unit="SLUG*FT2">    611903 </ixx>
 	<iyy unit="SLUG*FT2">   1735389 </iyy>
-	<izz unit="SLUG*FT2">   2301293 </izz--> 
+	<izz unit="SLUG*FT2">   2301293 </izz> 
 <!--
 ___________________A320_________A330__________A340
 BOW_____________178000________270000________283925
@@ -57,115 +65,102 @@ YAW MOI_________3950000______23089847_______24848934
 	<ixx unit="SLUG*FT2">   2262183 </ixx>
 	<iyy unit="SLUG*FT2">   3172439 </iyy>
 	<izz unit="SLUG*FT2">   3337024 </izz>
--->
+
 	<ixx unit="SLUG*FT2">1725000</ixx>
 	<iyy unit="SLUG*FT2">2550000</iyy>
-	<izz unit="SLUG*FT2">3950000</izz> 
+	<izz unit="SLUG*FT2">3950000</izz> -->
 
 	<ixy unit="SLUG*FT2">         0 </ixy>
 	<ixz unit="SLUG*FT2">         0 </ixz>
 	<iyz unit="SLUG*FT2">         0 </iyz>
-	<emptywt unit="KG">42095.1863</emptywt> <!-- #ref-11 page 48, WV011. 103300 lb - 5248x2 (engines)=92804lbs 42095.1863KG-->
-	<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 -->
+	<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> 642.00 </x>
+		<y> 0 </y>
+		<z> 0.00 </z>
 	</location>
 
-	<pointmass name="Crew">
-		<weight unit="LBS">400</weight> <!-- MAX: 600lbs-->
+	<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="PAX">
-		<weight unit="LBS">19750</weight> <!-- MAX: 39500 lbs ** looks too heavy. maybe low it and give a long cilinder shape. need to do some maths-->
-		<form shape="cylinder">
-			<radius unit="M"> 2.13 </radius>
-			<length unit="M"> 24.44 </length>
-		</form>
+	<pointmass name="Cabin Crew">
+		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
 		<location name="POINTMASS" unit="IN">
-			<x>705</x>
+			<x>696</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
 	</pointmass>
-
-<!-- NEW Pointmasses Start Weights for good CG -->
-	<pointmass name="Fwd Cargo">
-		<weight unit="LBS">3750</weight> <!-- #REF-3 page 19, MAX 3402 kilograms = 7500.12616 lbs -->
-		<form shape="cylinder">
-			<radius unit="M"> 1.24 </radius>
-			<length unit="M"> 4.95 </length>
-		</form> 
-		<location name="POINTMASS" unit="IN"> 
-			<!-- #REF-1 page 88+98,
-			x= (door form nose(8.16m))-(door with(1.816m)/2)+(Cargo compartment lenght(4.953m)/2)
-			x= 9.7285 meters = 383.011811 in
-			-->
-			<x>383.01</x>
-			<y>0</y>
-			<z>-59.05</z> <!-- Aprox lower deck 1.5 meters = 59.0551181 in -->
-		</location>
-	</pointmass>
-
-	<pointmass name="Aft Cargo">
-		<weight unit="LBS">0</weight> <!-- #REF-3 page 19, MAX 4536 kilograms = 10000.1682 lbs -->
-		<form shape="cylinder">
-			<radius unit="M"> 1.24 </radius>
-			<length unit="M"> 6.6 </length>
-		</form> 
-		<location name="POINTMASS" unit="IN"> 
-			<!-- #REF-1 page 88+98,
-			x= (door form nose(22.69m))-(door with(1.816m)/2)
-			x= 21.78200 meters = 857.559055 in
-			-->
-			<x>857.55</x>
-			<y>0</y>
-			<z>-59.05</z> <!-- Aprox lower deck 1.5 meters = 59.0551181 in -->
-		</location>
-	</pointmass>
-	<pointmass name="Rear Bulk Cargo">
-		<weight unit="LBS">0</weight> <!-- #REF-3 page 19, MAX 1497 kilograms = 3300.32006 lbs -->
-		<form shape="cylinder">
-			<radius unit="M"> 1.24 </radius>
-			<length unit="M"> 2 </length>
-		</form> 
-		<location name="POINTMASS" unit="IN"> 
-			<!-- #REF-1 page 88+102,
-			x= (door form nose(22.69m))+(door with(1.816m)/2)+( Dist. between rear doors(2.19))+(Aprox to compartment center (2m))
-			x= 27.78800 meters = 1 094.01575 in
-			-->
-			<x>1094</x>
-			<y>0</y>
-			<z>-39.37</z> <!-- Aprox bulk lower deck 1 meter = 39.3700787 in -->
-		</location>
-	</pointmass>
-	<pointmass name="Engine1">
-		<weight unit="LBS">5248</weight>
-		<form shape="cylinder">
-			<radius unit="M"> 1.31 </radius>
-			<length unit="M"> 5 </length>
-		</form>
+	<pointmass name="PAX 0A (60 seats)">
+		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>589.735</x>	
-			<y>-226.575</y>
-			<z>-45.567</z>
+			<x>470.1711</x>
+			<y>0</y>
+			<z>0</z>
 		</location>
 	</pointmass>
-	<pointmass name="Engine2">
-		<weight unit="LBS">5248</weight>
-		<form shape="cylinder">
-			<radius unit="M"> 1.31 </radius>
-			<length unit="M"> 5 </length>
-		</form>
+	<pointmass name="PAX 0B (60 seats)">
+		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>589.735</x>	
-			<y>226.575</y>
-			<z>-45.567</z>
+			<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>
 
@@ -295,7 +290,7 @@ YAW MOI_________3950000______23089847_______24848934
 			<z>-95.567</z>
 		</location>
 		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.5 </dynamic_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>
@@ -310,7 +305,7 @@ YAW MOI_________3950000______23089847_______24848934
 			<z>-95.567</z>
 		</location>
 		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_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>
@@ -372,8 +367,8 @@ YAW MOI_________3950000______23089847_______24848934
 			<z> 47.4138 </z>
 		</location>
 		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 0.4 </dynamic_friction>
-		<rolling_friction> 0.4 </rolling_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>
@@ -387,8 +382,8 @@ YAW MOI_________3950000______23089847_______24848934
 			<z> 35.7926 </z>
 		</location>
 		<static_friction> 1.0 </static_friction>
-		<dynamic_friction> 1 </dynamic_friction>
-		<rolling_friction> 1 </rolling_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>
@@ -413,9 +408,10 @@ YAW MOI_________3950000______23089847_______24848934
 </ground_reactions>
 
 <propulsion>
-	<engine file="v2533_a5">
+
+	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 589.735 </x>
+		<x> 620.0683 </x>
 		<y> -226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -429,9 +425,9 @@ YAW MOI_________3950000______23089847_______24848934
 	<feed>2</feed>
 	<thruster file="direct">
 		<location unit="IN">
-		<x> 589.735 </x>
+		<x> 655.4820 </x>
 		<y> -226.575 </y>
-		<z> -45.567 </z>
+		<z> 0.000 </z>
 		</location>
 		<orient unit="DEG">
 		<roll> 0.0 </roll>
@@ -440,9 +436,10 @@ YAW MOI_________3950000______23089847_______24848934
 		</orient>
 	</thruster>
 	</engine>
-	<engine file="v2533_a5">
+
+	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 589.735 </x>
+		<x> 620.00683 </x>
 		<y> 226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -456,9 +453,9 @@ YAW MOI_________3950000______23089847_______24848934
 	<feed>4</feed>
 	<thruster file="direct">
 		<location unit="IN">
-		<x> 589.735 </x>
+		<x> 655.4820 </x>
 		<y> 226.575 </y>
-		<z> -45.567 </z>
+		<z> 0.000 </z>
 		</location>
 		<orient unit="DEG">
 		<roll> 0.0 </roll>
@@ -469,92 +466,91 @@ YAW MOI_________3950000______23089847_______24848934
 	</engine>
 
 
-	<tank type="FUEL">    <!-- Left Tank (Wing tip Ventilation Surge) -->
+	<tank type="FUEL">    <!-- Left Tank (Wing tip Ventilation Surge) 0 -->
 		<location unit="IN">
-			<x> 788.4322 </x>
+			<x> 783.0709 </x>
 			<y> -574.4148 </y>
 			<z> 3.1080 </z>
 		</location>
-		<capacity unit="LBS"> 328.13 </capacity><!-- need review -->
+		<capacity unit="LBS"> 150 </capacity><!-- need review -->
 		<contents unit="LBS"> 0 </contents>
 		
 		<priority>4</priority>
 		<type>JET-A1</type>
 		<temperature>50</temperature>
 	</tank>
-	<tank type="FUEL">    <!-- Left Tank (Outer) -->
+	<tank type="FUEL">    <!-- Left Tank (Outer) 1 -->
 		<location unit="IN">
-			<x> 737.4190 </x>
+			<x> 739.5669 </x>
 			<y> -457.4259 </y>
 			<z> -8.0898 </z>
 		</location>
-		<capacity unit="LBS"> 1548.8 </capacity><!-- need review -->
-		<contents unit="LBS"> 154.88 </contents>
+		<capacity unit="LBS"> 1520.00 </capacity><!-- need review -->
+		<contents unit="LBS"> 0 </contents>
 		<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) -->
+	<tank type="FUEL">    <!-- Left Tank (Inner) 2 -->
 		<location unit="IN">
-			<x> 630.6588 </x>
+			<x> 652.5591 </x>
 			<y> -236.2992 </y>
 			<z> -33.9470 </z>
 		</location>
-		<capacity unit="LBS"> 12186.9 </capacity><!-- need review -->
-		<contents unit="LBS"> 2437.38 </contents>
+		<capacity unit="LBS"> 11982 </capacity><!-- need review -->
+		<contents unit="LBS"> 3000 </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 -->
+	<tank type="FUEL">    <!-- Center Tank 3 -->
 		<location unit="IN">
-			<x> 580.9955 </x>
+			<x> 522.0473 </x>
 			<y> 0 </y>
 			<z> -47.0 </z>
 		</location>
-		<capacity unit="LBS"> 14520 </capacity><!-- need review -->
-		<contents unit="LBS"> 0 </contents>
+		<capacity unit="LBS"> 14281 </capacity><!-- need review -->
+		<contents unit="LBS"> 3000 </contents>
 		<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) -->
+	<tank type="FUEL">    <!-- Right Tank (Inner) 4 -->
 		<location unit="IN">
-			<x> 630.6588 </x>
+			<x> 652.5591 </x>
 			<y> 236.2992 </y>
 			<z> -33.9470 </z>
 		</location>
-		<capacity unit="LBS"> 12186.9 </capacity><!-- need review -->
-		<contents unit="LBS"> 2437.38 </contents>
-		<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+		<capacity unit="LBS"> 11982 </capacity><!-- need review -->
+		<contents unit="LBS"> 3000 </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) -->
+	<tank type="FUEL">    <!-- Right Tank (Outer) 5 -->
 		<location unit="IN">
-			<x> 737.4190 </x>
+			<x> 739.5669 </x>
 			<y> 457.4259 </y>
 			<z> -8.0898 </z>
 		</location>
-		<capacity unit="LBS"> 1548.8 </capacity><!-- need review -->
-		<contents unit="LBS"> 154.88 </contents>
+		<capacity unit="LBS"> 1520 </capacity><!-- need review -->
+		<contents unit="LBS"> 0 </contents>
 		<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) -->
+	<tank type="FUEL">    <!-- Right Tank (Wing tip Ventilation Surge) 6 -->
 		<location unit="IN">
-			<x> 788.4322 </x>
+			<x> 783.0709 </x>
 			<y> 574.4148 </y>
 			<z> 3.1080 </z>
 		</location>
-		<capacity unit="LBS"> 328.13 </capacity><!-- need review -->
+		<capacity unit="LBS"> 150 </capacity><!-- need review -->
 		<contents unit="LBS"> 0 </contents>
 		<priority>4</priority>
 		<type>JET-A1</type>
@@ -566,7 +562,7 @@ YAW MOI_________3950000______23089847_______24848934
 <!--system file="a320-fuel" /-->
 <system file="glass-effect1"/>
 
-<flight_control name="FCS: A321">
+<flight_control name="FCS: A320">
 	<channel name="Pitch">
 	<summer name="Pitch Trim Sum">
 		<input>/controls/flight/elevator</input>
@@ -806,76 +802,114 @@ YAW MOI_________3950000______23089847_______24848934
    </aerosurface_scale>
 
 	</channel>
-	<channel name="Flaps">
-	<kinematic name="Flaps Control">
-		<input>fcs/flap-cmd-norm</input>
-		<traverse>
-		<setting>
-			<position>0</position>
-			<time>0</time>
-		</setting>
-		<setting>
-			<position>40</position>
-			<time>40</time>
-		</setting>
-		</traverse>
-		<output>fcs/flap-pos-deg</output>
-	</kinematic>
 
-	<aerosurface_scale name="Flap position normalized">
-		<input>fcs/flap-pos-deg</input>
-		<domain>
-		<min>0</min>
-		<max>40</max>
-		</domain>
-		<range>
-		<min>0</min>
-		<max>1</max>
-		</range>
-		<output>fcs/flap-pos-norm</output>
-	</aerosurface_scale>
+		<channel name="Flaps">
+
+		<kinematic name="Flaps Control">
+			<input>/controls/flight/flaps</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>35</position>
+				<time>40</time>
+			</setting>
+			</traverse>
+			<output>fcs/flap-pos-deg</output>
+		</kinematic>
+
+		<aerosurface_scale name="Flap position normalized">
+			<input>fcs/flap-pos-deg</input>
+			<domain>
+				<min>0</min>
+				<max>35</max>
+			</domain>
+			<range>
+				<min>0</min>
+				<max>1</max>
+			</range>
+			<output>fcs/flap-pos-norm</output>
+		</aerosurface_scale>
+
 	</channel>
+
+	<channel name="Slats">
+
+		<kinematic name="Slats Control">
+			<input>/controls/flight/slats</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>27</position>
+				<time>40</time>
+			</setting>
+			</traverse>
+			<output>fcs/slat-pos-deg</output>
+		</kinematic>
+
+		<aerosurface_scale name="Slat position normalized">
+			<input>fcs/slat-pos-deg</input>
+			<domain>
+			<min>0</min>
+			<max>27</max>
+			</domain>
+			<range>
+			<min>0</min>
+			<max>1</max>
+			</range>
+			<output>fcs/slat-pos-norm</output>
+		</aerosurface_scale>
+
+	</channel>
+
 	<channel name="Landing Gear">
-	<kinematic name="Gear Control">
-		<input>gear/gear-cmd-norm</input>
-		<traverse>
-		<setting>
-			<position>0</position>
-			<time>0</time>
-		</setting>
-		<setting>
-			<position>1</position>
-			<time>10</time>
-		</setting>
-		</traverse>
-		<output>gear/gear-pos-norm</output>
-	</kinematic>
+
+		<kinematic name="Gear Control">
+			<input>gear/gear-cmd-norm</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>1</position>
+				<time>10</time>
+			</setting>
+			</traverse>
+			<output>gear/gear-pos-norm</output>
+		</kinematic>
 	</channel>
+
 	<channel name="Speedbrake">
-	<kinematic name="Speedbrake">
-		<input>fcs/speedbrake-cmd-norm</input>
-		<traverse>
-		<setting>
-			<position>0</position>
-			<time>0</time>
-		</setting>
-		<setting>
-			<position>1</position>
-			<time>2</time>
-		</setting>
-		</traverse>
-		<output>fcs/speedbrake-pos-norm</output>
-	</kinematic>
+		<kinematic name="Speedbrake">
+			<input>fcs/speedbrake-cmd-norm</input>
+			<traverse>
+			<setting>
+				<position>0</position>
+				<time>0</time>
+			</setting>
+			<setting>
+				<position>1</position>
+				<time>2</time>
+			</setting>
+			</traverse>
+			<output>fcs/speedbrake-pos-norm</output>
+		</kinematic>
 	</channel>
     
-    <channel name="Tiller">
+	<channel name="Tiller">
 		
 		<switch name="/controls/gear/tiller-disabled">
-            <default value="0"/>
-            <test logic="AND" value="1">
-                /controls/gear/tiller-enabled == 0
-            </test>
-        </switch>
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/controls/gear/tiller-enabled == 0
+			</test>
+		</switch>
         
         <fcs_function name="Nose Wheel Steering 0">
             <function name="fcs/steer-nose-deg[0]">
@@ -918,677 +952,367 @@ YAW MOI_________3950000______23089847_______24848934
 </flight_control>
 
 
-<aerodynamics>
-	<function name="aero/function/kCDge">
-		<description>Change_in_drag_due_to_ground_effect</description>
-		<product>
-			<table>
-				<independentVar>aero/h_b-mac-ft</independentVar>
-				<tableData>
-					0.0000	0.4800
-					0.1000	0.5150
-					0.1500	0.6290
-					0.2000	0.7090
-					0.3000	0.8150
-					0.4000	0.8820
-					0.5000	0.9280
-					0.6000	0.9620
-					0.7000	0.9880
-					0.8000	1.0000
-					0.9000	1.0000
-					1.0000	1.0000
-					1.1000	1.0000
-				</tableData>
-			</table>
-		</product>
-	</function>
-	<function name="aero/function/kCLge">
-		<description>Change_in_lift_due_to_ground_effect</description>
-		<product>
-			<table>
-				<independentVar>aero/h_b-mac-ft</independentVar>
-				<tableData>
-					0.0000	1.2030
-					0.1000	1.1270
-					0.1500	1.0900
-					0.2000	1.0730
-					0.3000	1.0460
-					0.4000	1.0550
-					0.5000	1.0190
-					0.6000	1.0130
-					0.7000	1.0080
-					0.8000	1.0060
-					0.9000	1.0030
-					1.0000	1.0020
-					1.1000	1.0000
-				</tableData>
-			</table>
-		</product>
-	</function>
+	<aerodynamics>
 
+		<axis name="LIFT">
 
-	<axis name="LIFT">
-		<function name="aero/force/Lift_gain">
-			<description>Drag_at_zero_lift</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<value>0.30</value>
-			</product>
-		</function>
-
-		<!--function name="aero/coefficient/CLalpha">
-			<description>Lift_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	9.0000	10.0000	40.0000
-				-0.0900	-0.2200	-0.2200	-0.1200	-0.1200	0.3200
-				0.0000	0.2500	0.2500	0.3500	0.3500	0.7500
-				0.0900	0.7300	0.7300	0.8300	0.8300	1.2300
-				0.1000	0.8300	0.8300	0.9300	0.9300	1.3300
-				0.1200	0.9200	0.9200	1.0200	1.0200	1.4200
-				0.1400	1.0200	1.0200	1.1200	1.1200	1.5200
-				0.1600	1.0800	1.0800	1.1800	1.1800	1.5800
-				0.1700	1.1300	1.1300	1.2300	1.2300	1.6300
-				0.1900	1.1900	1.1900	1.2900	1.2900	1.6900
-				0.2100	1.2500	1.2500	1.3500	1.3500	1.7700
-				0.2400	1.3500	1.3700	1.4700	1.4800	1.9300
-				0.2600	1.4400	1.4700	1.5700	1.6200	2.1200
-				0.2800	1.4700	1.5100	1.6100	1.7800	2.4000
-				0.3000	1.5000	1.5600	1.6600	1.9000	2.3000
-				0.3200	1.4700	1.6100	1.6000	1.7000	2.0300
-				0.3400	1.3500	1.5000	1.4100	1.5000	1.5300
-				0.3600	1.1500	1.2000	1.2000	1.2000	1.2000
-				</tableData>
-			</table>
-			</product>
-		</function-->
-
-		<function name="aero/force/Lift_alpha">
-			<description>Lift_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>aero/function/kCLge</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	9.0000	10.0000	40.0000
-				-0.0900	-0.2200	-0.2200	-0.1200	-0.1200	0.2500
-				0.0000	0.2500	0.2500	0.3500	0.3500	0.7500
-				0.0900	0.7300	0.7300	0.8300	0.8300	1.2300
-				0.1000	0.8300	0.8300	0.9300	0.9300	1.3300
-				0.1200	0.9200	0.9200	1.0200	1.0200	1.4200
-				0.1400	1.0200	1.0200	1.1200	1.1200	1.5200
-				0.1600	1.0800	1.0800	1.1800	1.1800	1.5800
-				0.1700	1.1300	1.1300	1.2300	1.2300	1.6300
-				0.1900	1.1900	1.1900	1.2900	1.2900	1.6900
-				0.2100	1.2500	1.2500	1.3500	1.3500	1.7700
-				0.2400	1.3500	1.3700	1.4700	1.4800	1.9300
-				0.2600	1.4400	1.4700	1.5700	1.6200	2.1200
-				0.2800	1.4700	1.5100	1.6100	1.7800	2.4000
-				0.3000	1.5000	1.5600	1.6600	1.9000	2.3000
-				0.3200	1.4700	1.6100	1.6000	1.7000	2.0300
-				0.3400	1.3500	1.5000	1.4100	1.5000	1.5300
-				0.3600	1.1500	1.2000	1.2000	1.2000	1.2000
-				</tableData>
-			</table>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/CLDe">
-			<description>Lift_due_to_Elevator_Deflection</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>fcs/elevator-pos-rad</property>
-			<value>0.1930</value>
-			</product>
-		</function>-->
-		<function name="aero/force/Lift_elevator">
-			<description>Lift due to Elevator Deflection</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/elevator-pos-rad</property>
-				<value>0.1930</value>
-			</product>
-		</function>
-
-
-
-		<function name="aero/force/Lift_speedbrake">
-			<description>Delta Lift due to speedbrake</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/speedbrake-pos-norm</property>
-				<value>-0.15</value>
-			</product>
-		</function>
-
-
-  </axis>
-
-  <axis name="DRAG">
-
-		<function name="aero/force/Drag_zero_lift">
-			<description>Drag_at_zero_lift</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<value>0.016</value>
-			</product>
-		</function>
-<!--function name="aero/coefficient/CDalpha">
-			<description>Drag_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	25.0000	40.0000
-				-0.0873	0.0041	0.0000	0.0005	0.0014
-				-0.0698	0.0013	0.0004	0.0025	0.0041
-				-0.0524	0.0001	0.0023	0.0059	0.0084
-				-0.0349	0.0003	0.0057	0.0108	0.0141
-				-0.0175	0.0020	0.0105	0.0172	0.0212
-				0.0000	0.0052	0.0168	0.0251	0.0399
-				0.0175	0.0099	0.0248	0.0346	0.0502
-				0.0349	0.0162	0.0342	0.0457	0.0621
-				0.0524	0.0240	0.0452	0.0583	0.0755
-				0.0698	0.0334	0.0577	0.0724	0.0904
-				0.0873	0.0442	0.0718	0.0881	0.1068
-				0.1047	0.0566	0.0874	0.1053	0.1248
-				0.1222	0.0706	0.1045	0.1240	0.1443
-				0.1396	0.0860	0.1232	0.1442	0.1654
-				0.1571	0.0962	0.1353	0.1573	0.1790
-				0.1745	0.1069	0.1479	0.1708	0.1930
-				0.1920	0.1180	0.1610	0.1849	0.2075
-				0.2094	0.1298	0.1746	0.1995	0.2226
-				0.2269	0.1424	0.1892	0.2151	0.2386
-				0.2443	0.1565	0.2054	0.2323	0.2564
-				0.2618	0.1727	0.2240	0.2521	0.2767
-				0.2793	0.1782	0.2302	0.2587	0.2835
-				0.2967	0.1716	0.2227	0.2507	0.2753
-				0.3142	0.1618	0.2115	0.2388	0.2631
-				0.3316	0.1475	0.1951	0.2214	0.2451
-				0.3491	0.1097	0.1512	0.1744	0.1966
-				</tableData>
-			</table>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_alpha">
-			<description>Drag_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar lookup="row">aero/alpha-rad</independentVar>
-				<independentVar lookup="column">fcs/flap-pos-deg</independentVar>
-				<tableData>
-					0.0000	1.0000	25.0000	40.0000
-				-0.0873	0.0041	0.0000	0.0005	0.0014
-				-0.0698	0.0013	0.0004	0.0025	0.0041
-				-0.0524	0.0001	0.0023	0.0059	0.0084
-				-0.0349	0.0003	0.0057	0.0108	0.0141
-				-0.0175	0.0020	0.0105	0.0172	0.0212
-				0.0000	0.0052	0.0168	0.0251	0.0399
-				0.0175	0.0099	0.0248	0.0346	0.0502
-				0.0349	0.0162	0.0342	0.0457	0.0621
-				0.0524	0.0240	0.0452	0.0583	0.0755
-				0.0698	0.0334	0.0577	0.0724	0.0904
-				0.0873	0.0442	0.0718	0.0881	0.1068
-				0.1047	0.0566	0.0874	0.1053	0.1248
-				0.1222	0.0706	0.1045	0.1240	0.1443
-				0.1396	0.0860	0.1232	0.1442	0.1654
-				0.1571	0.0962	0.1353	0.1573	0.1790
-				0.1745	0.1069	0.1479	0.1708	0.1930
-				0.1920	0.1180	0.1610	0.1849	0.2075
-				0.2094	0.1298	0.1746	0.1995	0.2226
-				0.2269	0.1424	0.1892	0.2151	0.2386
-				0.2443	0.1565	0.2054	0.2323	0.2564
-				0.2618	0.1727	0.2240	0.2521	0.2767
-				0.2793	0.1782	0.2302	0.2587	0.2835
-				0.2967	0.1716	0.2227	0.2507	0.2753
-				0.3142	0.1618	0.2115	0.2388	0.2631
-				0.3316	0.1475	0.1951	0.2214	0.2451
-				0.3491	0.1097	0.1512	0.1744	0.1966
-				</tableData>
-			</table>
-			</product>
-		</function>
-
-   
-		<!--function name="aero/coefficient/CDde">
-			<description>Drag_due_to_elevator_Deflection</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/mag-elevator-pos-rad</property>
-				<value>0.0500</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_elevator">
-			<description>Drag due to Elevator Deflection</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<abs><property>fcs/elevator-pos-norm</property></abs>
-				<value>0.055</value>
-			</product>
-		</function>
-
-
-		<!--function name="aero/coefficient/CDbeta">
-			<description>Drag_due_to_sideslip</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>aero/mag-beta-rad</property>
-			<value>0.2000</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_beta">
-			<description>Drag_due_to_sideslip</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>aero/mag-beta-rad</property>
-				<value>0.2000</value>
-			</product>
-		</function>
-
-
-		<!--function name="aero/coefficient/CDgear">
-			<description>Drag_due_to_landing_gear</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>gear/gear-pos-norm</property>
-			<value>0.0400</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_gear">
-			<description>Drag due to gear</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>gear/gear-pos-norm</property>
-				<value>0.04</value>
-			</product>
-		</function>
-
-		<!--function name="aero/coefficient/CDspeedbrake">
-			<description>Drag_due_to_speedbrake</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>fcs/speedbrake-pos-norm</property>
-			<value>0.0400</value>
-			</product>
-		</function-->
-		<function name="aero/force/Drag_speedbrake">
-			<description>Drag due to speedbrakes</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/speedbrake-pos-norm</property>
-				<value>0.04</value>
-			</product>
-		</function>
-
-		<!--function name="aero/coefficient/CDo">
-			<description>Drag_at_zero_lift</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<value>0.016</value>
-			</product>
-		</function-->
-
-		<function name="aero/force/Drag_mach">
-			<description>Drag due to mach</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<table>
-					<independentVar lookup="row">velocities/mach</independentVar>
+			<function name="aero/force/Lift_alpha">
+				<description>Lift due to alpha</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">aero/alpha-rad</independentVar>
 						<tableData>
-						0.00      0.000
-						0.79      0.000
-						1.10      0.023
-						1.80      0.015
+							-0.20 -0.780
+							 0.00  0.345
+							 0.23  1.100
+							 0.60  0.700
 						</tableData>
-				</table>
-			</product>
-		</function>
+					</table>
+				</product>
+			</function>
 
-  </axis>
+			<function name="aero/force/Lift_flap">
+				<description>Delta Lift due to flaps</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/flap-pos-deg</property>
+					<value> 0.00700 </value>
+				</product>
+			</function>
 
-  <axis name="SIDE">
-		<!-- function name="aero/coefficient/CYb">
-			<description>Side_force_due_to_beta</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<table>
-				<independentVar>aero/beta-rad</independentVar>
-				<tableData>
-				-0.3500	0.5000
-				0.0000	0.0000
-				0.3500	-0.5000
-				</tableData>
-			</table>
-			</product>
-		</function -->
-		<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/Lift_slats">
+				<description>Delta Lift due to slats</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/slat-pos-deg</property>
+					<value> 0.02000 </value>
+				</product>
+			</function>
 
-  </axis>
+			<function name="aero/force/Lift_speedbrake">
+				<description>Delta Lift due to speedbrake</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/speedbrake-pos-norm</property>
+					<value>-0.1</value>
+				</product>
+			</function>
 
-  <axis name="ROLL">
-		<!--function name="aero/coefficient/Clb">
-			<description>Roll_moment_due_to_beta</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<table>
-				<independentVar>aero/beta-rad</independentVar>
-				<tableData>
-				-0.3500	0.0100
-				0.0000	0.0000
-				0.3500	-0.0100
-				</tableData>
-			</table>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_beta">
-			<description>Roll moment due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/beta-rad</property>
-				<value>-0.1</value>
-			</product>
-		</function>
+			<function name="aero/force/Lift_elevator">
+				<description>Lift due to Elevator Deflection</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/elevator-pos-rad</property>
+					<value>0.15</value>
+				</product>
+			</function>
 
+		</axis>
 
-		<!--function name="aero/coefficient/Clp">
-			<description>Roll_moment_due_to_roll_rate_(roll_damping)</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/bi2vel</property>
-			<property>velocities/p-aero-rad_sec</property>
-			<value>-0.5000</value>
-			</product>
-		</function-->
+		<axis name="DRAG">
 
-		<function name="aero/moment/Roll_damp">
-			<description>Roll moment due to roll rate</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/bi2vel</property>
-				<property>velocities/p-aero-rad_sec</property>
-				<value>-0.4</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_basic">
+				<description>Drag at zero lift</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">aero/alpha-rad</independentVar>
+						<tableData>
+							-1.57    1.300
+							-0.26    0.021
+							 0.00    0.012
+							 0.26    0.021
+							 1.57    1.300
+						</tableData>
+					</table>
+				</product>
+			</function>
 
+			<function name="aero/force/Drag_induced">
+				<description>Induced drag</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>aero/cl-squared</property>
+					<value>0.041</value>
+				</product>
+			</function>
 
-		<!--function name="aero/coefficient/Clr">
-			<description>Roll_moment_due_to_yaw_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/bi2vel</property>
-			<property>velocities/r-aero-rad_sec</property>
-			<value>0.0050</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_yaw">
-			<description>Roll moment due to yaw rate</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/bi2vel</property>
-				<property>velocities/r-aero-rad_sec</property>
-				<value>0.005</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_mach">
+				<description>Drag due to mach</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">velocities/mach</independentVar>
+						<tableData>
+							 0.00      0.000
+							 0.79      0.000
+							 1.10      0.023
+							 1.80      0.015
+						</tableData>
+					</table>
+				</product>
+			</function>
 
+			<function name="aero/force/Drag_flap">
+				<description>Drag due to flaps</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/flap-pos-deg</property>
+					<value> 0.00120 </value>
+				</product>
+			</function>
 
-		<!--function name="aero/coefficient/Clda">
-			<description>Roll_moment_due_to_aileron</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>fcs/left-aileron-pos-rad</property>
-			<!- value>0.2000</value -> <!- Excesive roll !!! ->
+			<function name="aero/force/Drag_slats">
+				<description>Drag due to slats</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/flap-pos-deg</property>
+					<value> 0.00120 </value>
+				</product>
+			</function>
 
-			<table>
-				<independentVar lookup="row">velocities/mach</independentVar>
-					<tableData>
-						0.0    0.100
-						2.0    0.033
-					</tableData>
-			</table>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_aileron">
-			<description>Roll moment due to aileron</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>fcs/left-aileron-pos-rad</property>
-				<table>
-					<independentVar lookup="row">velocities/mach</independentVar>
-					<tableData>
-						0.0    0.100
-						2.0    0.033
-					</tableData>
-				</table>
-			</product>
-		</function>
+			<function name="aero/force/Drag_gear">
+				<description>Drag due to gear</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>gear/gear-pos-norm</property>
+					<value>0.020</value>
+				</product>
+			</function>
 
-		<!--function name="aero/coefficient/Cldr">
-			<description>Roll_moment_due_to_rudder</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>fcs/rudder-pos-rad</property>
-			<value>0.0050</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Roll_rudder">
-			<description>Roll moment due to rudder</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>fcs/rudder-pos-rad</property>
-				<value>0.005</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_speedbrake">
+				<description>Drag due to speedbrakes</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>fcs/speedbrake-pos-norm</property>
+					<value>0.02</value>
+				</product>
+			</function>
 
-	</axis>
+			<function name="aero/force/Drag_beta">
+				<description>Drag due to sideslip</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<table>
+						<independentVar lookup="row">aero/beta-rad</independentVar>
+						<tableData>
+							-1.57    1.230
+							-0.26    0.050
+							 0.00    0.000
+							 0.26    0.050
+							 1.57    1.230
+						</tableData>
+					</table>
+				</product>
+			</function>
 
-	<axis name="PITCH">
-		<function name="aero/moment/Pitch_zero_alpha_and_flaps">
-			<description>Pitching_moment_at_zero_alpha</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/cbarw-ft</property>
-				<table>
-					<independentVar>fcs/flap-pos-deg</independentVar>
-					<tableData>
-					0.0000	0.0000
-					40.0000	-0.1000
-					</tableData>
-				</table>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_alpha">
-			<description>Pitch_moment_due_to_alpha</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>aero/alpha-rad</property>
-			<!-- value>-4.0000</value> -->
-			<value>-0.6</value>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_elevator">
-			<description>Pitch_moment_due_to_elevator_Deflection</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>fcs/elevator-pos-rad</property>
-			<!-- <value>-1.5000</value>  Excesive Pitch -->
-			<table>
-				<independentVar lookup="row">velocities/mach</independentVar>
-				<tableData>
-					0.0     -1.200
-					2.0     -0.300
-				</tableData>
-			</table>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_damp">
-			<description>Pitch_moment_due_to_pitch_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>aero/ci2vel</property>
-			<property>velocities/q-aero-rad_sec</property>
-			<!--value>-10.0000</value-->
-			<value>-10</value>
-			</product>
-		</function>
-		<function name="aero/moment/Pitch_alpha_rate">
-			<description>Pitch_moment_due_to_alpha_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/cbarw-ft</property>
-			<property>aero/ci2vel</property>
-			<property>aero/alphadot-rad_sec</property>
-			<!--value>-12.0000</value-->
-			<value>-12</value>
-			</product>
-		</function>
+			<function name="aero/force/Drag_elevator">
+				<description>Drag due to Elevator Deflection</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<abs><property>fcs/elevator-pos-norm</property></abs>
+					<value>0.045</value>
+				</product>
+			</function>
 
-	</axis>
+		</axis>
 
-	<axis name="YAW">
-		<!--function name="aero/coefficient/Cnr">
-			<description>Yaw_moment_due_to_yaw_rate</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/bi2vel</property>
-			<property>velocities/r-aero-rad_sec</property>
-			<value>-0.0400</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Yaw_damp">
-			<description>Yaw moment due to yaw rate</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/bi2vel</property>
-				<property>velocities/r-aero-rad_sec</property>
-				<value>-0.15</value>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/Cnb">
-			<description>Yaw_moment_due_to_beta</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>aero/beta-rad</property>
-			<value>0.2000</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Yaw_beta">
-			<description>Yaw moment due to beta</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>aero/beta-rad</property>
-				<value>0.12</value>
-			</product>
-		</function>
-		<!--function name="aero/coefficient/Cndr">
-			<description>Yaw_moment_due_to_rudder</description>
-			<product>
-			<property>aero/qbar-psf</property>
-			<property>metrics/Sw-sqft</property>
-			<property>metrics/bw-ft</property>
-			<property>fcs/rudder-pos-rad</property>
-			<!- <value>-0.5000</value> Excesive Yaw->
-			<value>-0.3</value>
-			</product>
-		</function-->
-		<function name="aero/moment/Yaw_rudder">
-			<description>Yaw moment due to rudder</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>metrics/bw-ft</property>
-				<property>fcs/rudder-pos-rad</property>
-				<value>-0.2</value>
-			</product>
-		</function>
+		<axis name="SIDE">
 
-    <!--function name="aero/moment/Yaw_aileron">
-       <description>Adverse yaw</description>
-       <product>
-           <property>aero/qbar-psf</property>
-           <property>metrics/Sw-sqft</property>
-           <property>metrics/bw-ft</property>
-           <property>fcs/left-aileron-pos-rad</property>
-           <value>0</value>
-       </product>
-    </function-->
+			<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">
 
-	</axis>
+			<function name="aero/moment/Roll_beta">
+				<description>Roll moment due to beta</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/beta-rad</property>
+					<value>-0.1</value>
+				</product>
+			</function>
 
-</aerodynamics>
+			<function name="aero/moment/Roll_damp">
+				<description>Roll moment due to roll rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/bi2vel</property>
+					<property>velocities/p-aero-rad_sec</property>
+					<value>-0.4</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Roll_yaw">
+				<description>Roll moment due to yaw rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/bi2vel</property>
+					<property>velocities/r-aero-rad_sec</property>
+					<value>0.15</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Roll_aileron">
+				<description>Roll moment due to aileron</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/left-aileron-pos-rad</property>
+					<value>0.1</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Roll_rudder">
+				<description>Roll moment due to rudder</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/rudder-pos-rad</property>
+					<value>0.01</value>
+				</product>
+			</function>
+
+		</axis>
+
+		<axis name="PITCH">
+
+			<function name="aero/moment/Pitch_alpha">
+				<description>Pitch moment due to alpha</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>aero/alpha-rad</property>
+					<value>-0.6</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Pitch_elevator">
+				<description>Pitch moment due to elevator</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>fcs/elevator-pos-rad</property>
+					<table>
+						<independentVar lookup="row">velocities/mach</independentVar>
+						<tableData>
+							0.0     -1.200
+							2.0     -0.300
+						</tableData>
+					</table>
+				</product>
+			</function>
+
+			<function name="aero/moment/Pitch_damp">
+				<description>Pitch moment due to pitch rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>aero/ci2vel</property>
+					<property>velocities/q-aero-rad_sec</property>
+					<value>-17</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Pitch_alphadot">
+				<description>Pitch moment due to alpha rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/cbarw-ft</property>
+					<property>aero/ci2vel</property>
+					<property>aero/alphadot-rad_sec</property>
+					<value>-6</value>
+				</product>
+			</function>
+
+		</axis>
+
+		<axis name="YAW">
+
+			<function name="aero/moment/Yaw_beta">
+				<description>Yaw moment due to beta</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/beta-rad</property>
+					<value>0.12</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Yaw_damp">
+				<description>Yaw moment due to yaw rate</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>aero/bi2vel</property>
+					<property>velocities/r-aero-rad_sec</property>
+					<value>-0.15</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Yaw_rudder">
+				<description>Yaw moment due to rudder</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/rudder-pos-rad</property>
+					<value>-0.1</value>
+				</product>
+			</function>
+
+			<function name="aero/moment/Yaw_aileron">
+				<description>Adverse yaw</description>
+				<product>
+					<property>aero/qbar-psf</property>
+					<property>metrics/Sw-sqft</property>
+					<property>metrics/bw-ft</property>
+					<property>fcs/left-aileron-pos-rad</property>
+					<value>0</value>
+				</product>
+			</function>
+
+		</axis>
+
+	</aerodynamics>
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
diff --git a/Models/A320-main.xml b/Models/A320-main.xml
deleted file mode 100644
index 71d0b5f4..00000000
--- a/Models/A320-main.xml
+++ /dev/null
@@ -1,527 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<PropertyList>
-
-	<sim>
-		
-		<author>Joshua Davidson (it0uchpods/411)</author>
-
-		<model>
-			<pushback>
-				<kp type="double">1000</kp>
-				<ki type="double">0</ki>
-				<kd type="double">0</kd>
-				<position-norm type="double">0</position-norm>
-			</pushback>
-		</model>
-
-		
-<!-- Splash screens. One is randomly chosen when FlightGear starts -->
-<startup>
-<splash-texture>Aircraft/A320Family/splash/splash.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-1.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-2.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-3.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-4.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-5.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-6.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-7.png</splash-texture>
-<splash-texture>Aircraft/A320Family/splash/splash-8.png</splash-texture>
-</startup>
-		
-		
-		<flaps>
-			<setting>0.000</setting>
-			<setting>0.290</setting>
-			<setting>0.596</setting>
-			<setting>0.645</setting>
-			<setting>1.000</setting>
-		</flaps>
-
-		<systems>
-			<!-- Disable the generic electrical system and use the Nasal system -->
-			<electrical>
-				<path></path>
-			</electrical>
-			<autopilot>
-				<path>Aircraft/A320Family/Systems/it-autoflight.xml</path>
-			</autopilot>
-			<!-- Uses slightly modified IT-AUTOFLIGHT Thrust controller. -->
-            <autopilot>
-                <path>Aircraft/A320Family/Systems/custom-autothrust.xml</path>
-            </autopilot>
-            <autopilot>
-                <path>Aircraft/A320Family/Systems/thrust.xml</path>
-            </autopilot>
-            <autopilot>
-                <name>Custom engine values system</name>
-                <path>Aircraft/A320Family/Systems/engine-timing.xml</path>
-            </autopilot>
-			<autopilot>
-				<name>Autobrake</name>
-				<path>Aircraft/A320Family/Systems/a320-autobrake.xml</path>
-			</autopilot>
-			<autopilot>
-				<name>Spoilers</name>
-				<path>Aircraft/A320Family/Systems/a320-spoilers.xml</path>
-			</autopilot>
-			<property-rule n="101">
-				<path>Systems/fl2070_sound.xml</path>
-			</property-rule>
-			<property-rule n="102">
-				<path>Systems/pfd.xml</path>
-			</property-rule>
-		</systems>
-
-		<chase-distance-m>-85</chase-distance-m>
-
-		
-
-		<instrumentation>
-			<path>Aircraft/A320Family/Systems/instrumentation.xml</path>
-		</instrumentation>
-
-		<alarms>
-			<master-caution type="bool">false</master-caution>
-		</alarms>
-
-		<menubar>
-			<default>
-				<menu n="3">
-					<item>
-						<name>autopilot</name>
-						<label>Autopilot Settings</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							 var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml");
-							 autopilot.open();
-							</script>
-						</binding>
-					</item>
-				</menu>
-				<menu n="100">
-					<enabled type="bool">true</enabled>
-					<item>
-						<name>autostart</name>
-						<label>Autostart</label>
-						<binding>
-							<command>property-toggle</command>
-							<property>sim/model/start-idling</property>
-						</binding>
-					</item>
-					<item>
-						<label>Select Livery</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							 aircraft.livery.dialog.open();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<name>pushback</name>
-						<label>Pushback</label>
-						<binding>
-							<command>dialog-show</command>
-							<dialog-name>pushback</dialog-name>
-						</binding>
-					</item>
-				</menu>
-			</default>
-		</menubar>
-
-		<!-- Multiplayer properties -->
-		<multiplay>
-			<generic>
-				<float n="0" alias="/controls/lighting/dome-norm" />
-				<float n="1" alias="/controls/lighting/interior" />
-				<int n="2" alias="/controls/lighting/landing-lights[0]" />
-				<int n="3" alias="/controls/lighting/landing-lights[1]" />
-				<int n="4" alias="/controls/lighting/landing-lights[2]" />
-				<int n="5" alias="/sim/model/lights/nav-lights" />
-				<int n="6" alias="/sim/model/lights/logo-lights" />
-				<int n="7" alias="/sim/model/lights/strobe/state" />
-				<int n="8" alias="/controls/lighting/wing-lights" />
-				<int n="9" alias="/sim/model/lights/beacon/state" />
-				<int n="10" alias="/engines/engine[0]/contrail" />
-				<int n="11" alias="/engines/engine[1]/contrail" />
-			</generic>
-		</multiplay>
-	</sim>
-
-	<consumables>
-		<fuel>
-			<tank n="0">
-				<name>Left Wing Vent</name>
-			</tank>
-			<tank n="1">
-				<name>Left Wing Outer</name>
-			</tank>
-			<tank n="2">
-				<name>Left Wing Inner</name>
-			</tank>
-			<tank n="3">
-				<name>Center</name>
-			</tank>
-			<tank n="4">
-				<name>Right Wing Inner</name>
-			</tank>
-			<tank n="5">
-				<name>Right Wing Outer</name>
-			</tank>
-			<tank n="6">
-				<name>Right Wing Vent</name>
-			</tank>
-		</fuel>
-	</consumables>
-	
-
-	<payload>
-		<weight n="0">
-			<name>Cockpit Crew</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]" />
-			<min-lb type="double">200</min-lb>
-			<max-lb type="double">440</max-lb>
-		</weight>
-		<weight n="1">
-			<name>Cabin Crew</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]" />
-			<min-lb type="double">300</min-lb>
-			<max-lb type="double">1320</max-lb>
-		</weight>
-		<weight n="2">
-			<name>PAX 0A (60 seats)</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]" />
-			<min-lb type="double">300</min-lb>
-			<max-lb type="double">13200</max-lb>
-		</weight>
-		<weight n="3">
-			<name>PAX 0B (60 seats)</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]" />
-			<min-lb type="double">300</min-lb>
-			<max-lb type="double">13200</max-lb>
-		</weight>
-		<weight n="4">
-			<name>PAX 0C (54 seats)</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]" />
-			<min-lb type="double">300</min-lb>
-			<max-lb type="double">11880</max-lb>
-		</weight>
-		<weight n="5">
-			<name>Cargo Hold 1</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[5]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">7500.126</max-lb>
-		</weight>
-		<weight n="6">
-			<name>Cargo Hold 3</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[6]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">5384.414</max-lb>
-		</weight>
-		<weight n="7">
-			<name>Cargo Hold 4</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[7]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">4651.754</max-lb>
-		</weight>
-		<weight n="8">
-			<name>Cargo Hold 5</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[8]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">3300.320</max-lb>
-		</weight>
-	</payload>
-
-
-<it-autoflight>
-	<settings>
-		<altitude-dial-mode>0</altitude-dial-mode>
-		<no-generics>1</no-generics>
-		<roll>
-			<umin>-0.40</umin>
-			<umax>0.40</umax>
-			<kp>0.09</kp>
-			<kp-vorloc>0.06</kp-vorloc>
-		</roll>
-		<pitch>
-			<umin>-0.25</umin>
-			<umax>0.25</umax>
-			<kp>-0.05</kp>
-		</pitch>
-		<flch>
-			<umin>-0.25</umin>
-			<umax>0.25</umax>
-			<kp>-0.03</kp>
-		</flch>
-		<gs>
-			<kp>0.10</kp>
-		</gs>
-	</settings>
-</it-autoflight>
-
-	<autopilot>
-		<autobrake>
-			<config>
-				<idle-throttle type="double">0.1</idle-throttle>
-				<pilot-input type="double">0</pilot-input>
-			</config>
-			<step type="int">0</step>
-		</autobrake>
-	</autopilot>
-
-	<controls>
-		<APU>
-			<fire-switch type="bool">false</fire-switch>
-			<master-switch type="bool">false</master-switch>
-			<starter type="bool">false</starter>
-		</APU>
-		<electric>
-			<avionics-switch type="bool">true</avionics-switch>
-		</electric>
-		<engines>
-			<engine-start-switch type="int">1</engine-start-switch>
-			<engine n="0">
-				<cutoff type="bool">true</cutoff>
-				<cutoff-switch type="bool">true</cutoff-switch>
-				<starter type="bool">false</starter>
-				<starter-switch type="bool">false</starter-switch>
-				<max-athr-thrust type="float">0.94</max-athr-thrust>
-			</engine>
-			<engine n="1">
-				<cutoff type="bool">true</cutoff>
-				<cutoff-switch type="bool">true</cutoff-switch>
-				<starter type="bool">false</starter>
-				<starter-switch type="bool">false</starter-switch>
-				<max-athr-thrust type="float">0.94</max-athr-thrust>
-			</engine>
-			<detents>
-				<current type="string">none</current>
-				<throttle type="float">0</throttle>
-				<rev type="float">-0.59</rev>
-				<idle type="float">0</idle>
-				<clb type="float">0.72</clb>
-				<flex type="float">0.98</flex>
-				<toga type="float">1</toga>
-			</detents>
-		</engines>
-		<flight>
-			<ground-spoilers-armed type="bool">false</ground-spoilers-armed>
-			<speedbrake-lever type="double">0</speedbrake-lever>
-		</flight>
-		<gear>
-			<brake-parking type="bool">true</brake-parking>
-            <tiller-cmd-norm type="double">0</tiller-cmd-norm>
-			<tiller-enabled type="bool">false</tiller-enabled>
-		</gear>
-		<lighting>
-			<beacon type="bool">false</beacon>
-			<interior type="double">0</interior>
-			<cockpit type="bool">false</cockpit>
-			<cones type="bool">true</cones>
-			<dome-norm type="double">0</dome-norm>
-			<landing-lights n="0" type="bool">false</landing-lights>
-			<landing-lights n="1" type="bool">false</landing-lights>
-			<landing-lights n="2" type="bool">false</landing-lights>
-			<nav-lights-switch type="int">0</nav-lights-switch>
-			<overhead-panel-norm type="double">0.8</overhead-panel-norm>
-			<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>
-			<strobe type="bool">false</strobe>
-		</lighting>
-		<switches>
-			<!-- Smoking is bad :P -->
-			<no-smoking-sign type="bool">true</no-smoking-sign>
-			<seatbelt-sign type="bool">false</seatbelt-sign>
-		</switches>
-	</controls>
-	
-	<engines>
-		<apu>
-			<rpm type="double">0</rpm>
-			<on-fire type="bool">false</on-fire>
-			<running type="bool">false</running>
-			<serviceable type="bool">true</serviceable>
-		</apu>
-		<engine n="0">
-			<on-fire type="bool">false</on-fire>
-			<reverser-pos-norm type="double">0</reverser-pos-norm>
-			<running type="bool">false</running>
-		</engine>
-		<engine n="1">
-			<on-fire type="bool">false</on-fire>
-			<reverser-pos-norm type="double">0</reverser-pos-norm>
-			<running type="bool">false</running>
-		</engine>
-	</engines>
-
-	<gear>
-		<gear n="0">
-			<tyre-smoke type="int">0</tyre-smoke>
-			<sprayspeed-ms type="double">0</sprayspeed-ms>
-			<spray-density type="double">0</spray-density>
-			<caster-angle-deg-damped type="double">0</caster-angle-deg-damped>
-		</gear>
-		<gear n="1">
-			<tyre-smoke type="int">0</tyre-smoke>
-			<sprayspeed-ms type="double">0</sprayspeed-ms>
-			<spray-density type="double">0</spray-density>
-			<caster-angle-deg-damped type="double">0</caster-angle-deg-damped>
-		</gear>
-		<gear n="2">
-			<tyre-smoke type="int">0</tyre-smoke>
-			<sprayspeed-ms type="double">0</sprayspeed-ms>
-			<spray-density type="double">0</spray-density>
-			<caster-angle-deg-damped type="double">0</caster-angle-deg-damped>
-		</gear>
-	</gear>
-
-	<instrumentation>
-	
-		<efis n="0">
-
-			<ecam>
-					<display-mode type="string">FCTL</display-mode>
-			</ecam>
-			
-		</efis>
-	
-		<efis n="1">
-
-			<ecam>
-					<display-mode type="string">FCTL</display-mode>
-			</ecam>
-
-		</efis>
-		
-		<tcas><!-- http://wiki.flightgear.org/index.php/TCAS -->
-			<serviceable type="bool">true</serviceable><!-- TCAS ENABLE -->
-			<inputs>
-				<mode type="int">3</mode><!-- 0=off, 1=standby, 2=TA-only, 3=auto(TA/RA) -->
-			</inputs>
-			<voice>
-				<file-prefix type="string">Sounds/tcas/female/</file-prefix>
-				<!-- sound file path and prefix -->
-			</voice>
-			<speaker><!-- Speaker Configuration -->
-				<max-dist> 2 </max-dist><!-- Max. distance where speaker is heard -->
-				<reference-dist> 1 </reference-dist> <!-- Distance to pilot -->
-				<volume> 0.8 </volume> <!-- Volume at reference distance -->
-			</speaker>
-		</tcas>
-		<nav-compass>
-			<nav-display n="0" type="int">0</nav-display>
-			<nav-display n="1" type="int">0</nav-display>
-		</nav-compass>
-
-		<!-- See http://wiki.flightgear.org/index.php/GPWS -->
-		<mk-viii>
-			<serviceable type="bool">true</serviceable>
-			<configuration-module>
-				<category-1 type="int">255</category-1>
-				<category-3 type="int">2</category-3>
-				<category-4 type="int">13</category-4>
-				<category-5 type="int">0</category-5>
-				<category-6 type="int">1</category-6>
-				<category-7 type="int">124</category-7>
-				<category-8 type="int">3</category-8>
-				<category-9 type="int">3</category-9> 
-				<category-10 type="int">6</category-10>
-				<category-13 type="int">7</category-13>
-				<category-14 type="int">0</category-14>
-			</configuration-module>
-			<inputs>
-				<arinc429>
-					<decision-height-ncd type="bool">false</decision-height-ncd>
-					<decision-height type="double">250</decision-height>
-				</arinc429>
-			</inputs>
-			<speaker>
-				<max-dist type="double">2</max-dist>
-				<reference-dist type="double">1</reference-dist>
-				<volume type="double">2</volume>
-			</speaker>
-			<voice>
-				<file-prefix>Aircraft/A320Family/Sounds/GPWS/</file-prefix>
-			</voice>
-		</mk-viii>
-		
-		<groundradar>
-			<range type="double">1.0</range>
-		</groundradar>
-		
-		<chrono n="0">
-			<started type="bool">false</started>
-			<paused type="bool">false</paused>
-			<text type="string">0' 00'</text>
-			<started-at type="int">0</started-at>
-			<elapsed-time type="int">0</elapsed-time>
-		</chrono>
-
-		<chrono n="1">
-			<started type="bool">false</started>
-			<paused type="bool">false</paused>
-			<text type="string">0' 00'</text>
-			<started-at type="int">0</started-at>
-			<elapsed-time type="int">0</elapsed-time>
-		</chrono>
-		
-	</instrumentation>
-	
-	<modes>
-		<altimeter>
-			<inhg>0</inhg>
-		</altimeter>
-		<pfd>
-			<minimums-mode>DH</minimums-mode>
-			<ILS1>false</ILS1>
-			<ILS2>false</ILS2>
-			<stallvls>-10</stallvls>
-			<fma>
-				<athr-box>O  </athr-box>
-			</fma>
-		</pfd>
-	</modes>
-
-	<input>
-		<keyboard>
-			<key n="127">
-				<name>Delete</name>
-				<desc>Toggle thrust reversers</desc>
-				<binding>
-					<command>nasal</command>
-					<script>
-					 A320.engine1.reverse_thrust();
-					 A320.engine2.reverse_thrust();
-					</script>
-				</binding>
-			</key>
-			<key n="2">
-				<name>Ctrl-b</name>
-				<desc>Cycle speedbrake setting</desc>
-				<binding>
-					<command>property-assign</command>
-					<property>controls/flight/speedbrake-arm</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<command>property-cycle</command>
-					<property>controls/flight/speedbrake-lever</property>
-					<value>0</value>
-					<value>0.5</value>
-					<value>1</value>
-				</binding>
-			</key>
-		</keyboard>
-	</input>
-
-	<aircraft>
-		<door n="0">
-			<x-m>16.582</x-m>
-			<y-m>9.702</y-m>
-			<z-m>3.642</z-m>
-		</door>
-		<jetway-hood-deg type="double">3</jetway-hood-deg>
-	</aircraft>
-
-</PropertyList>