From 61eaad689b2ee3376f9fa640534c712b6165d71d Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 28 Sep 2017 22:17:47 -0400
Subject: [PATCH] A32X: FDM: Fix Weight/Balence, Payload, CG/AeroRP, Contact
 Points, and apply to all models new FDM

---
 A318-100-CFM.xml        | 341 ++++++++----------
 A319-100-CFM.xml        | 341 ++++++++----------
 A319-100-IAE.xml        | 345 +++++++++---------
 A320-100-CFM.xml        | 343 +++++++++---------
 A320-200-CFM.xml        | 771 +++++++++++++++++++---------------------
 A320-200-IAE.xml        | 163 ++++-----
 A320neo-CFM.xml         | 339 ++++++++----------
 A320neo-PW.xml          | 339 ++++++++----------
 A321-200-CFM.xml        | 341 ++++++++----------
 A321-200-IAE.xml        | 343 +++++++++---------
 A321neo-CFM.xml         | 341 ++++++++----------
 A321neo-PW.xml          | 341 ++++++++----------
 Models/A318-100-CFM.xml |   2 +-
 Models/A319-100-CFM.xml |   2 +-
 Models/A319-100-IAE.xml |   2 +-
 Models/A320-100-CFM.xml |   1 -
 Models/A320-200-CFM.xml |   1 -
 Models/A320-200-IAE.xml |   1 -
 Models/A320neo-CFM.xml  |   1 -
 Models/A320neo-PW.xml   |   1 -
 Models/A321-200-CFM.xml |   2 +-
 Models/A321-200-IAE.xml |   2 +-
 Models/A321neo-CFM.xml  |   2 +-
 Models/A321neo-PW.xml   |   2 +-
 Nasal/libraries.nas     |   2 +-
 25 files changed, 2046 insertions(+), 2323 deletions(-)

diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml
index 45c75526..d5291eac 100644
--- a/A318-100-CFM.xml
+++ b/A318-100-CFM.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="cfm56_5b9">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="cfm56_5b9">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
-	<aerodynamics file="Systems/a318-aerodynamics.xml" />
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml
index f79d4a4d..ac0cf9cd 100644
--- a/A319-100-CFM.xml
+++ b/A319-100-CFM.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="cfm56_5b6">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="cfm56_5b6">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
-	<aerodynamics file="Systems/a319-aerodynamics.xml" />
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index febef75a..4953b079 100644
--- a/A319-100-IAE.xml
+++ b/A319-100-IAE.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -359,11 +334,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 
 	<propulsion>
-		<engine file="v2527_a5">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+		<engine file="v2522_a5">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -385,11 +360,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 
-		<engine file="v2527_a5">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+		<engine file="v2522_a5">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
-	<aerodynamics file="Systems/a319-aerodynamics.xml" />
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index 79f35e3b..b0bc5c8b 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -359,11 +334,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 
 	<propulsion>
-		<engine file="cfm56_5a1">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+		<engine file="cfm56_5b1">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -385,11 +360,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 
-		<engine file="cfm56_5a1">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+		<engine file="cfm56_5b1">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
+		
 	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index 08fee8f8..634c8b73 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -11,40 +11,39 @@
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
-    <fileheader>
-        <author>Joshua Davidson (it0uchpods)</author>
-        <version>Pre V1.0</version>
-        <description>A3XX FDE</description>
-    </fileheader>
+	<fileheader>
+		<author>Joshua Davidson (it0uchpods)</author>
+		<version>Pre V1.0</version>
+		<description>A3XX FDE</description>
+	</fileheader>
 
-    <metrics>
-        <wingarea  unit="FT2"> 1319.79 </wingarea>
-        <wingspan  unit="FT" >  111.26 </wingspan>
-        <wing_incidence>          1.03 </wing_incidence>
-        <chord     unit="FT" >   13.76 </chord>
-        <htailarea unit="FT2">  334.24 </htailarea>
-        <htailarm  unit="FT" >   57.88 </htailarm>
-        <vtailarea unit="FT2">  248.79 </vtailarea>
-        <vtailarm  unit="FT" >   57.33 </vtailarm>
+	<metrics>
+		<wingarea  unit="FT2"> 1319.79 </wingarea>
+		<wingspan  unit="FT" >  111.26 </wingspan>
+		<wing_incidence>          1.03 </wing_incidence>
+		<chord     unit="FT" >   13.76 </chord>
+		<htailarea unit="FT2">  334.24 </htailarea>
+		<htailarm  unit="FT" >   57.88 </htailarm>
+		<vtailarea unit="FT2">  248.79 </vtailarea>
+		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,404 +56,380 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
+	</mass_balance>
+
+	<ground_reactions>
+		<contact type="BOGEY" name="NOSE_LG">
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
+			</location>
+			<static_friction> 0.8 </static_friction>
+			<dynamic_friction> 0.5 </dynamic_friction>
+			<rolling_friction> 0.02 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+			<max_steer unit="DEG"> 70 </max_steer>
+			<brake_group> NOSE </brake_group>
+			<retractable>1</retractable>
+		</contact>
+		<contact type="BOGEY" name="LEFT_MLG">
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
+			</location>
+			<static_friction> 0.8 </static_friction>
+			<dynamic_friction> 0.5 </dynamic_friction>
+			<rolling_friction> 0.02 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> LEFT </brake_group>
+			<retractable>1</retractable>
+		</contact>
+		<contact type="BOGEY" name="RIGHT_MLG">
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
+			</location>
+			<static_friction> 0.8 </static_friction>
+			<dynamic_friction> 0.5 </dynamic_friction>
+			<rolling_friction> 0.02 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> RIGHT </brake_group>
+			<retractable>1</retractable>
+		</contact>
+
+		<contact type="STRUCTURE" name="NOSE_1">
+			<location unit="M">
+				<x> 2.6272 </x>
+				<y> 0 </y>
+				<z> -1.10572 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="NOSE_2">
+			<location unit="M">
+				<x> 5.0858 </x>
+				<y> 0 </y>
+				<z> 1.34919 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
 		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
+				<y> 0 </y>
+				<z> -2.11157 </z>
 			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
+				<y> 0 </y>
+				<z> -2.10594 </z>
 			</location>
-		</pointmass>
-    </mass_balance>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
 
-    <ground_reactions>
-        <!-- REF-1 page 165 + 271  -->
-        <contact type="BOGEY" name="NOSE_LG">
-            <location unit="IN">
-                <x> 197.6772 </x>
-                <y> 0 </y>
-                <z> -137.9617 </z>
-            </location>
-            <static_friction> 0.8 </static_friction>
-            <dynamic_friction> 0.5 </dynamic_friction>
-            <rolling_friction> 0.02 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
-            <max_steer unit="DEG"> 70 </max_steer>
-            <!-- REF-1 page 133 -->
-            <brake_group> NOSE </brake_group>
-            <retractable>1</retractable>
-        </contact>
-        <contact type="BOGEY" name="LEFT_MLG">
-            <location unit="IN">
-                <!--<x> 699.9243 </x>-->
-                <x> 695.3149 </x>
-                <y> -149.4094 </y>
-                <z> -150.4824 </z>
-            </location>
-            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-            <static_friction> 0.8 </static_friction>
-            <dynamic_friction> 0.5 </dynamic_friction>
-            <rolling_friction> 0.02 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> LEFT </brake_group>
-            <retractable>1</retractable>
-        </contact>
-        <contact type="BOGEY" name="RIGHT_MLG">
-            <location unit="IN">
-                <!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-                <x> 695.3149 </x>
-                <y> 149.4094 </y>
-                <z> -150.4824 </z>
-            </location>
-            <!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
-            <static_friction> 0.8 </static_friction>
-            <dynamic_friction> 0.5 </dynamic_friction>
-            <rolling_friction> 0.02 </rolling_friction>
-            <!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
-            <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> RIGHT </brake_group>
-            <retractable>1</retractable>
-        </contact>
+		<contact type="STRUCTURE" name="ENG_1">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="ENG_2">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.5 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
 
-        <contact type="STRUCTURE" name="NOSE_1">
-            <location unit="IN">
-                <x> 37.7953 </x>
-                <y> 0 </y>
-                <z> -38.1374 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="NOSE_2">
-            <location unit="IN">
-                <x> 128.1102 </x>
-                <y> 0 </y>
-                <z> -55.0271 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="CENTER_1">
-            <location unit="IN">
-                <x> 274.0157 </x>
-                <y> 0 </y>
-                <z> -60.0665 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="CENTER_2">
-            <location unit="IN">
-                <x> 930 </x>
-                <y> 0 </y>
-                <z> -60.0665 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
+		<contact type="STRUCTURE" name="TAIL_1">
+			<location unit="M">
+				<x> 40.0923 </x>
+				<y> 0 </y>
+				<z> 0.85936 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TAIL_2">
+			<location unit="M">
+				<x> 38.543 </x>
+				<y> 0 </y>
+				<z> 7.84126 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="WING_TIP_1">
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="WING_TIP_2">
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 1 </dynamic_friction>
+			<rolling_friction> 1 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+	</ground_reactions>
 
-        <contact type="STRUCTURE" name="ENG_1">
-            <location unit="IN">
-                <x>589.735</x>
-                <y>-226.575</y>
-                <z>-95.567</z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="ENG_2">
-            <location unit="IN">
-                <x>589.735</x>
-                <y>226.575</y>
-                <z>-95.567</z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.5 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
+	<propulsion>
+		<engine file="cfm56_5b4">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
+			</location>
+			<orient unit="DEG">
+				<roll> 0.0 </roll>
+				<pitch> 2.2 </pitch>
+				<yaw> 1 </yaw>
+			</orient>
+			<feed>3</feed>
+			<thruster file="direct">
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
+				</location>
+				<orient unit="DEG">
+				<roll> 0.0 </roll>
+				<pitch> 2.2 </pitch>
+				<yaw> 1 </yaw>
+				</orient>
+			</thruster>
+		</engine>
 
-
-        <contact type="STRUCTURE" name="TAIL_1">
-            <location unit="IN">
-                <x> 1097.9921 </x>
-                <y> 0 </y>
-                <z> -44.7722 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="TAIL_2">
-            <location unit="IN">
-                <x> 1225 </x>
-                <y> 0 </y>
-                <z> -18.8067 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="TAIL_3">
-            <location unit="IN">
-                <x> 1341.6142 </x>
-                <y> 0 </y>
-                <z> -10.2599 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="TAIL_4">
-            <location unit="IN">
-                <x> 1469.0945 </x>
-                <y> 0 </y>
-                <z> 47.4138 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 1 </dynamic_friction>
-            <rolling_friction> 1 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="WING_TIP_1">
-            <location unit="IN">
-                <x> 838.8898 </x>
-                <y> -667.5197 </y>
-                <z> 35.7926 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 0.4 </dynamic_friction>
-            <rolling_friction> 0.4 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-        <contact type="STRUCTURE" name="WING_TIP_2">
-            <location unit="IN">
-                <x> 838.8898 </x>
-                <y> 667.5197 </y>
-                <z> 35.7926 </z>
-            </location>
-            <static_friction> 1.0 </static_friction>
-            <dynamic_friction> 1 </dynamic_friction>
-            <rolling_friction> 1 </rolling_friction>
-            <spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-            <damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-            <max_steer unit="DEG"> 0.0 </max_steer>
-            <brake_group> NONE </brake_group>
-            <retractable>0</retractable>
-        </contact>
-    </ground_reactions>
-
-    <propulsion>
-        <engine file="cfm56_5b4">
-            <location unit="IN">
-                <x> 620.0683 </x>
-                <y> -226.575 </y>
-                <z> -45.567 </z>
-            </location>
-            <orient unit="DEG">
-                <roll> 0.0 </roll>
-                <pitch> 2.2 </pitch>
-                <yaw> 1 </yaw>
-            </orient>
-            <feed>3</feed>
-            <thruster file="direct">
-                <location unit="IN">
-                    <x> 655.4820 </x>
-                    <y> -226.575 </y>
-                    <z> 0.000 </z>
-                </location>
-                <orient unit="DEG">
-                    <roll> 0.0 </roll>
-                    <pitch> 2.2 </pitch>
-                    <yaw> 1 </yaw>
-                </orient>
-            </thruster>
-        </engine>
-
-        <engine file="cfm56_5b4">
-            <location unit="IN">
-                <x> 620.0683 </x>
-                <y> 226.575 </y>
-                <z> -45.567 </z>
-            </location>
-            <orient unit="DEG">
-                <roll> 0.0 </roll>
-                <pitch> 2.2 </pitch>
-                <yaw> -1 </yaw>
-            </orient>
-            <feed>4</feed>
-            <thruster file="direct">
-                <location unit="IN">
-                    <x> 655.4820 </x>
-                    <y> 226.575 </y>
-                    <z> 0.000 </z>
-                </location>
-                <orient unit="DEG">
-                    <roll> 0.0 </roll>
-                    <pitch> 2.2 </pitch>
-                    <yaw> -1 </yaw>
-                </orient>
-            </thruster>
-        </engine>
+		<engine file="cfm56_5b4">
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
+			</location>
+			<orient unit="DEG">
+				<roll> 0.0 </roll>
+				<pitch> 2.2 </pitch>
+				<yaw> -1 </yaw>
+			</orient>
+			<feed>4</feed>
+			<thruster file="direct">
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
+				</location>
+				<orient unit="DEG">
+				<roll> 0.0 </roll>
+				<pitch> 2.2 </pitch>
+				<yaw> -1 </yaw>
+				</orient>
+			</thruster>
+		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,40 +437,40 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
 			<priority>1</priority>
 			<type>JET-A1</type>
 		</tank>
-    </propulsion>
+	</propulsion>
 
-    <system file="pushback" />
-    <system file="fuel" />
-    <system file="glass-effect1" />
-    <system file="fmgc" />
-    <system file="fcs" />
+	<system file="pushback" />
+	<system file="fuel" />
+	<system file="glass-effect1" />
+	<system file="fmgc" />
+	<system file="fcs" />
 
 	<flight_control name="none"/>
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
-    <aerodynamics file="Systems/a320-aerodynamics.xml" />
-
-    <external_reactions>
-        <force name="pushback" frame="BODY">
-            <location unit="IN">
-                <x>294</x>
-                <y>0</y>
-                <z>-149</z>
-            </location>
-            <direction>
-                <x>1</x>
-                <y>0</y>
-                <z>0</z>
-            </direction>
-        </force>
-    </external_reactions>
+	<external_reactions>
+		<force name="pushback" frame="BODY">
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
+			</location>
+			<direction>
+				<x>1</x>
+				<y>0</y>
+				<z>0</z>
+			</direction>
+		</force>
+	</external_reactions>
 </fdm_config>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index fa83fa92..d161b2c6 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -14,7 +14,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<fileheader>
 		<author>Joshua Davidson (it0uchpods)</author>
 		<version>Pre V1.0</version>
-		<description>A32X Professional Flight Dynamics</description>
+		<description>A3XX FDE</description>
 	</fileheader>
 
 	<metrics>
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="M">
-			<x> 19.6974 </x>
+			<x> 19.0974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
@@ -57,24 +57,24 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<emptywt unit="LBS">80431</emptywt>
 
 		<location name="CG" unit="M">
-			<x> 18.5231 </x>
+			<x> 18.4231 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
 
-		<!--pointmass name="Crew">
+		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="M">
-				<x> 18.5231 </x>
+				<x> 5.29845 </x>
 				<y> 0 </y>
-				<z> 0.19249 </z>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
 			<location name="POINTMASS" unit="M">
-				<x> 18.5231 </x>
+				<x> 18.4231 </x>
 				<y> 0 </y>
 				<z> 0.19249 </z>
 			</location>
@@ -83,20 +83,20 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
 			<location name="POINTMASS" unit="M"> 
-				<x> 18.5231 </x>
+				<x> 13.0849 </x>
 				<y> 0 </y>
-				<z> 0.19249 </z>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
 			<location name="POINTMASS" unit="M">
-				<x> 18.5231 </x>
+				<x> 24.5565 </x>
 				<y> 0 </y>
-				<z> 0.19249 </z>
+				<z> -1.18112 </z>
 			</location>
-		</pointmass-->
+		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
@@ -146,11 +146,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 
-		<!--contact type="STRUCTURE" name="NOSE_1">
+		<contact type="STRUCTURE" name="NOSE_1">
 			<location unit="M">
-				<x> 37.7953 </x>
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -163,9 +163,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
 			<location unit="M">
-				<x> 128.1102 </x>
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -176,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
 			<location unit="M">
-				<x> 274.0157 </x>
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -191,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
+		<contact type="STRUCTURE" name="BOTTOM_2">
 			<location unit="M">
-				<x> 930 </x>
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -209,9 +241,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 		<contact type="STRUCTURE" name="ENG_1">
 			<location unit="M">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -224,9 +256,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
 			<location unit="M">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -240,9 +272,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 		<contact type="STRUCTURE" name="TAIL_1">
 			<location unit="M">
-				<x> 1097.9921 </x>
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -255,9 +287,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
 			<location unit="M">
-				<x> 1225 </x>
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -268,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="M">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="M">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
 			<location unit="M">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -315,9 +318,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
 			<location unit="M">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -327,7 +330,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<max_steer unit="DEG"> 0.0 </max_steer>
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
-		</contact-->
+		</contact>
 	</ground_reactions>
 
 	<propulsion>
@@ -385,9 +388,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
 			<location unit="M">
-				<x> 18.5231 </x>
-				<y> 0 </y>
-				<z> 0.19249 </z>
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
 			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
@@ -398,9 +401,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
 			<location unit="M">
-				<x> 18.5231 </x>
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> 0.19249 </z>
+				<z> -0.61182 </z>
 			</location>
 			<capacity unit="LBS"> 14281 </capacity>
 			<contents unit="LBS"> 0 </contents> 
@@ -411,9 +414,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
 			<location unit="M">
-				<x> 18.5231 </x>
-				<y> 0 </y>
-				<z> 0.19249 </z>
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
 			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
@@ -424,7 +427,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
 			<location unit="M">
-				<x> 18.5231 </x>
+				<x> 18.4231 </x>
 				<y> 0 </y>
 				<z> 0.19249 </z>
 			</location>
@@ -435,7 +438,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
 			<location unit="M">
-				<x> 18.5231 </x>
+				<x> 18.4231 </x>
 				<y> 0 </y>
 				<z> 0.19249 </z>
 			</location>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 85cc5b7f..6e64a88e 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="leap1a26">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="leap1a26">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
+		
 	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 00f6174d..15277964 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="pw1127g">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="pw1127g">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
+		
 	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml
index 3628ab4e..02917e13 100644
--- a/A321-200-CFM.xml
+++ b/A321-200-CFM.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="cfm56_5b3">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="cfm56_5b3">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
-	<aerodynamics file="Systems/a321-aerodynamics.xml" />
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index d9c7ddb7..dab479ea 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="v2533_a5">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="v2533_a5">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -480,16 +455,16 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fmgc" />
 	<system file="fcs" />
 
-	<flight_control name="none" />
-
-	<aerodynamics file="Systems/a321-aerodynamics.xml" />
+	<flight_control name="none"/>
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml
index 1cbaf277..797d9793 100644
--- a/A321neo-CFM.xml
+++ b/A321neo-CFM.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="leap1a32">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="leap1a32">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
-	<aerodynamics file="Systems/a321-aerodynamics.xml" />
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/A321neo-PW.xml b/A321neo-PW.xml
index 719332ed..65bd47e9 100644
--- a/A321neo-PW.xml
+++ b/A321neo-PW.xml
@@ -27,24 +27,23 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarea unit="FT2">  248.79 </vtailarea>
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
-	   <location name="AERORP" unit="IN">
-			<x> 655.00 </x>
+	   <location name="AERORP" unit="M">
+			<x> 19.0974 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </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>
+		<location name="EYEPOINT" unit="M">
+			<x> 0 </x>
 			<y> 0 </y>
-			<z> -37 </z>
+			<z> 0 </z>
 		</location>
 
+		<location name="VRP" unit="M">
+			<x> 18.8499 </x>
+			<y> 0 </y>
+			<z> -1.7005004 </z>
+		</location>
 	</metrics>
 
 	<mass_balance>
@@ -57,73 +56,55 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<iyz unit="SLUG*FT2">0</iyz>
 		<emptywt unit="LBS">80431</emptywt>
 
-		<location name="CG" unit="IN">
-			<x> 646.00 </x>
+		<location name="CG" unit="M">
+			<x> 18.4231 </x>
 			<y> 0 </y>
-			<z> 0.00 </z>
+			<z> 0.19249 </z>
 		</location>
 
 		<pointmass name="Crew">
 			<weight unit="LBS">380</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 5.29845 </x>
+				<y> 0 </y>
+				<z> -0.66384 </z>
 			</location>
 		</pointmass>
 		
 		<pointmass name="PAX">
 			<weight unit="LBS">23000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>646.00</x>
-				<y>0</y>
-				<z>0</z>
+			<location name="POINTMASS" unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Fwd Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN"> 
-				<x>437.5944</x>
-				<y>0</y>
-				<z>-24.5866</z> 
+			<location name="POINTMASS" unit="M"> 
+				<x> 13.0849 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 
 		<pointmass name="Aft Cargo">
 			<weight unit="LBS">3000</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>1029.6850</x>
-				<y>0</y>
-				<z>-24.5866</z>
-			</location>
-		</pointmass>
-		
-		<pointmass name="Engine 1">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>-5.755</y>
-				<z>-78.56019</z>
-			</location>
-		</pointmass>
-		<pointmass name="Engine 2">
-			<weight unit="LBS">5200.7</weight>
-			<location name="POINTMASS" unit="IN">
-				<x>530.86</x>
-				<y>5.755</y>
-				<z>-78.56019</z>
+			<location name="POINTMASS" unit="M">
+				<x> 24.5565 </x>
+				<y> 0 </y>
+				<z> -1.18112 </z>
 			</location>
 		</pointmass>
 	</mass_balance>
 
 	<ground_reactions>
-		<!-- REF-1 page 165 + 271  -->
 		<contact type="BOGEY" name="NOSE_LG">
-			<location unit="IN">
-				<x> 197.6772 </x>
+			<location unit="M">
+				<x> 7.52385 </x>
 				<y> 0 </y>
-				<z> -137.9617 </z>
+				<z> -4.31395 </z>
 			</location>
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -131,18 +112,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
 			<max_steer unit="DEG"> 70 </max_steer>
-			<!-- REF-1 page 133 -->
 			<brake_group> NOSE </brake_group>
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="LEFT_MLG">
-			<location unit="IN">
-				<!--<x> 699.9243 </x>-->
-				<x> 695.3149 </x>
-				<y> -149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> -4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
@@ -153,19 +131,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>1</retractable>
 		</contact>
 		<contact type="BOGEY" name="RIGHT_MLG">
-			<location unit="IN">
-				<!-- <x> 697.3425 </x> It should be right left simetric
-			<x> 699.9243 </x> -->
-				<x> 695.3149 </x>
-				<y> 149.4094 </y>
-				<z> -150.4824 </z>
+			<location unit="M">
+				<x> 20.318 </x>
+				<y> 4.25855 </y>
+				<z> -4.51844 </z>
 			</location>
-			<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
 			<static_friction> 0.8 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
 			<rolling_friction> 0.02 </rolling_friction>
-			<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
-		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
 			<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
 			<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
 			<max_steer unit="DEG"> 0.0 </max_steer>
@@ -174,10 +147,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="NOSE_1">
-			<location unit="IN">
-				<x> 37.7953 </x>
+			<location unit="M">
+				<x> 2.6272 </x>
 				<y> 0 </y>
-				<z> -38.1374 </z>
+				<z> -1.10572 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -189,10 +162,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="NOSE_2">
-			<location unit="IN">
-				<x> 128.1102 </x>
+			<location unit="M">
+				<x> 5.0858 </x>
 				<y> 0 </y>
-				<z> -55.0271 </z>
+				<z> 1.34919 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -203,11 +176,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_1">
-			<location unit="IN">
-				<x> 274.0157 </x>
+		
+		<contact type="STRUCTURE" name="BOTTOM_1">
+			<location unit="M">
+				<x> 6.84944 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.11157 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -218,11 +192,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="CENTER_2">
-			<location unit="IN">
-				<x> 930 </x>
+		<contact type="STRUCTURE" name="BOTTOM_2">
+			<location unit="M">
+				<x> 27.7516 </x>
 				<y> 0 </y>
-				<z> -60.0665 </z>
+				<z> -2.10594 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		
+		<contact type="STRUCTURE" name="TOP_1">
+			<location unit="M">
+				<x> 8.9842 </x>
+				<y> 0 </y>
+				<z> 2.00377 </z>
+			</location>
+			<static_friction> 1.0 </static_friction>
+			<dynamic_friction> 0.4 </dynamic_friction>
+			<rolling_friction> 0.4 </rolling_friction>
+			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+			<max_steer unit="DEG"> 0.0 </max_steer>
+			<brake_group> NONE </brake_group>
+			<retractable>0</retractable>
+		</contact>
+		<contact type="STRUCTURE" name="TOP_2">
+			<location unit="M">
+				<x> 30.4145 </x>
+				<y> 0 </y>
+				<z> 1.98661 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -235,10 +240,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</contact>
 
 		<contact type="STRUCTURE" name="ENG_1">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>-226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -250,10 +255,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="ENG_2">
-			<location unit="IN">
-				<x>589.735</x>
-				<y>226.575</y>
-				<z>-95.567</z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -3.1750887 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.5 </dynamic_friction>
@@ -265,12 +270,11 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 
-
 		<contact type="STRUCTURE" name="TAIL_1">
-			<location unit="IN">
-				<x> 1097.9921 </x>
+			<location unit="M">
+				<x> 40.0923 </x>
 				<y> 0 </y>
-				<z> -44.7722 </z>
+				<z> 0.85936 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -282,10 +286,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="TAIL_2">
-			<location unit="IN">
-				<x> 1225 </x>
+			<location unit="M">
+				<x> 38.543 </x>
 				<y> 0 </y>
-				<z> -18.8067 </z>
+				<z> 7.84126 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -296,41 +300,12 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<brake_group> NONE </brake_group>
 			<retractable>0</retractable>
 		</contact>
-		<contact type="STRUCTURE" name="TAIL_3">
-			<location unit="IN">
-				<x> 1341.6142 </x>
-				<y> 0 </y>
-				<z> -10.2599 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 0.4 </dynamic_friction>
-			<rolling_friction> 0.4 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
-		<contact type="STRUCTURE" name="TAIL_4">
-			<location unit="IN">
-				<x> 1469.0945 </x>
-				<y> 0 </y>
-				<z> 47.4138 </z>
-			</location>
-			<static_friction> 1.0 </static_friction>
-			<dynamic_friction> 1 </dynamic_friction>
-			<rolling_friction> 1 </rolling_friction>
-			<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
-			<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
-			<max_steer unit="DEG"> 0.0 </max_steer>
-			<brake_group> NONE </brake_group>
-			<retractable>0</retractable>
-		</contact>
+		
 		<contact type="STRUCTURE" name="WING_TIP_1">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> -667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> -16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 0.4 </dynamic_friction>
@@ -342,10 +317,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<retractable>0</retractable>
 		</contact>
 		<contact type="STRUCTURE" name="WING_TIP_2">
-			<location unit="IN">
-				<x> 838.8898 </x>
-				<y> 667.5197 </y>
-				<z> 35.7926 </z>
+			<location unit="M">
+				<x> 23.7872 </x>
+				<y> 16.9102 </y>
+				<z> 0.22943 </z>
 			</location>
 			<static_friction> 1.0 </static_friction>
 			<dynamic_friction> 1 </dynamic_friction>
@@ -360,10 +335,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<propulsion>
 		<engine file="pw1133g">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> -226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> -5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -372,10 +347,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>3</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> -226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> -5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -386,10 +361,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<engine file="pw1133g">
-			<location unit="IN">
-				<x> 620.0683 </x>
-				<y> 226.575 </y>
-				<z> -45.567 </z>
+			<location unit="M">
+				<x> 14.3962788 </x>
+				<y> 5.755 </y>
+				<z> -2.0771987 </z>
 			</location>
 			<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -398,10 +373,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</orient>
 			<feed>4</feed>
 			<thruster file="direct">
-				<location unit="IN">
-				<x> 655.4820 </x>
-				<y> 226.575 </y>
-				<z> 0.000 </z>
+				<location unit="M">
+					<x> 14.3962788 </x>
+					<y> 5.755 </y>
+					<z> -2.0771987 </z>
 				</location>
 				<orient unit="DEG">
 				<roll> 0.0 </roll>
@@ -412,49 +387,49 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</engine>
 
 		<tank type="FUEL">    <!-- Left Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> -236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> -5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Center Tank -->
-			<location unit="IN">
-				<x> 522.0473 </x>
+			<location unit="M">
+				<x> 18.2231 </x>
 				<y> 0 </y>
-				<z> -47.0 </z>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
-			<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
-			<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+			<capacity unit="LBS"> 14281 </capacity>
+			<contents unit="LBS"> 0 </contents> 
+			<standpipe unit="LBS">43</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Right Wing Tank -->
-			<location unit="IN">
-				<x> 652.5591 </x>
-				<y> 236.2992 </y>
-				<z> -33.9470 </z>
+			<location unit="M">
+				<x> 17.8501 </x>
+				<y> 5.1104 </y>
+				<z> -0.61182 </z>
 			</location>
-			<capacity unit="LBS"> 13914 </capacity><!-- correct by FCOM -->
+			<capacity unit="LBS"> 13914 </capacity>
 			<contents unit="LBS"> 6000 </contents>
-			<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+			<standpipe unit="LBS">31</standpipe>
 			<priority>1</priority>
 			<type>JET-A1</type>
 			<temperature>50</temperature>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 1 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -462,10 +437,10 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<type>JET-A1</type>
 		</tank>
 		<tank type="FUEL">    <!-- Engine 2 Pipes -->
-			<location unit="IN">
-				<x>589.735</x>	
-				<y>0</y>
-				<z>-45.567</z>
+			<location unit="M">
+				<x> 18.4231 </x>
+				<y> 0 </y>
+				<z> 0.19249 </z>
 			</location>
 			<capacity unit="LBS">10</capacity>
 			<contents unit="LBS">0</contents>
@@ -481,15 +456,15 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	<system file="fcs" />
 
 	<flight_control name="none"/>
-
-	<aerodynamics file="Systems/a321-aerodynamics.xml" />
+		
+	<aerodynamics file="Systems/a320-aerodynamics.xml" />
 
 	<external_reactions>
 		<force name="pushback" frame="BODY">
-			<location unit="IN">
-				<x>294</x>
-				<y>0</y>
-				<z>-149</z>
+			<location unit="M">
+				<x> 7.52385 </x>
+				<y> 0 </y>
+				<z> -4.31395 </z>
 			</location>
 			<direction>
 				<x>1</x>
diff --git a/Models/A318-100-CFM.xml b/Models/A318-100-CFM.xml
index 351ed767..2974767c 100644
--- a/Models/A318-100-CFM.xml
+++ b/Models/A318-100-CFM.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>10.1</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/A319-100-CFM.xml b/Models/A319-100-CFM.xml
index 141099c3..55ee98bd 100644
--- a/Models/A319-100-CFM.xml
+++ b/Models/A319-100-CFM.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>9.43</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/A319-100-IAE.xml b/Models/A319-100-IAE.xml
index dfa6c086..5b3094fd 100644
--- a/Models/A319-100-IAE.xml
+++ b/Models/A319-100-IAE.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>9.43</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index 11c71377..98dce76a 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -41,7 +41,6 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>7.83</x-m>
-			<!-- <z-m>-1.8306008</z-m> Didn't touch ground -->
 			<z-m>-2</z-m>
 		</offsets>
 	</model>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index 87465e2d..eb4859de 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -41,7 +41,6 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>7.83</x-m>
-			<!-- <z-m>-1.8306008</z-m> Didn't touch ground -->
 			<z-m>-2</z-m>
 		</offsets>
 	</model>
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 2bbdca7a..dde23b6b 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -41,7 +41,6 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>7.83</x-m>
-			<!-- <z-m>-1.8306008</z-m> Didn't touch ground -->
 			<z-m>-2</z-m>
 		</offsets>
 	</model>
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index c4559bf5..c6e764c1 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -41,7 +41,6 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>7.83</x-m>
-			<!-- <z-m>-1.8306008</z-m> Didn't touch ground -->
 			<z-m>-2</z-m>
 		</offsets>
 	</model>
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index fff60ea6..3a354703 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -41,7 +41,6 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>7.83</x-m>
-			<!-- <z-m>-1.8306008</z-m> Didn't touch ground -->
 			<z-m>-2</z-m>
 		</offsets>
 	</model>
diff --git a/Models/A321-200-CFM.xml b/Models/A321-200-CFM.xml
index 959d01f3..41b4d6c6 100644
--- a/Models/A321-200-CFM.xml
+++ b/Models/A321-200-CFM.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>3.56</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/A321-200-IAE.xml b/Models/A321-200-IAE.xml
index cebd1920..4a6d4f31 100644
--- a/Models/A321-200-IAE.xml
+++ b/Models/A321-200-IAE.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>3.56</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/A321neo-CFM.xml b/Models/A321neo-CFM.xml
index d01a4e22..674b2169 100644
--- a/Models/A321neo-CFM.xml
+++ b/Models/A321neo-CFM.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>3.56</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/A321neo-PW.xml b/Models/A321neo-PW.xml
index b2781bf4..88b703d0 100644
--- a/Models/A321neo-PW.xml
+++ b/Models/A321neo-PW.xml
@@ -41,7 +41,7 @@
 		<path>Aircraft/IDG-A32X/Models/LandingGears/a320.nlg.xml</path>
 		<offsets>
 			<x-m>3.56</x-m>
-			<z-m>-1.8306008</z-m>
+			<z-m>-2</z-m>
 		</offsets>
 	</model>
 
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 18bffe0e..95aa51a6 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -246,7 +246,7 @@ setlistener("/options/steep-ils", func {
 
 var aglgears = func {
     var agl = getprop("/position/altitude-agl-ft") or 0;
-    var aglft = agl - 11.101;  # is the position from the Airbus A320 above ground
+    var aglft = agl - 14.001;  # is the position from the Airbus A320 above ground
     var aglm = aglft * 0.3048;
     setprop("/position/gear-agl-ft", aglft);
     setprop("/position/gear-agl-m", aglm);