diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml
index 8e45b3c3..440f2dfa 100644
--- a/A318-100-CFM.xml
+++ b/A318-100-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml
index 15af04e4..2259be01 100644
--- a/A319-100-CFM.xml
+++ b/A319-100-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index 78ea87d0..d25387f5 100644
--- a/A319-100-IAE.xml
+++ b/A319-100-IAE.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index 191b71d2..f44d4061 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index fee4bf76..4a9f33c7 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
         <vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,99 +63,58 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-        <pointmass name="Cockpit Crew">
-            <weight unit="LBS">400</weight>
-            <!-- MAX: 400lbs, two pilots-->
-            <location name="POINTMASS" unit="IN">
-                <x>200</x>
-                <y>0</y>
-                <z>0</z>
-            </location>
-        </pointmass>
-        <pointmass name="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>
-        </pointmass>
-        <pointmass name="PAX 0A (60 seats)">
-            <weight unit="LBS">6600</weight>
-            <!-- MAX: 13200lbs, 60 seats -->
-            <location name="POINTMASS" unit="IN">
-                <x>470.1711</x>
-                <y>0</y>
-                <z>0</z>
-            </location>
-        </pointmass>
-        <pointmass name="PAX 0B (60 seats)">
-            <weight unit="LBS">6600</weight>
-            <!-- MAX: 13200lbs, 60 seats -->
-            <location name="POINTMASS" unit="IN">
-                <x>809.5669</x>
-                <y>0</y>
-                <z>0</z>
-            </location>
-        </pointmass>
-        <pointmass name="PAX 0C (54 seats)">
-            <weight unit="LBS">5940</weight>
-            <!-- MAX: 11880lbs, 54 seats -->
-            <location name="POINTMASS" unit="IN">
-                <x>1163.2729</x>
-                <y>0</y>
-                <z>0</z>
-            </location>
-        </pointmass>
-        <pointmass name="Cargo Hold 1">
-            <weight unit="LBS">2000</weight>
-            <!-- MAX: 7500.126lbs -->
-            <location name="POINTMASS" unit="IN">
-                <x>383.4792</x>
-                <y>0</y>
-                <z>-29.5</z>
-                <!-- 1.5m and now half of it for the center point of the load -->
-            </location>
-        </pointmass>
-        <!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-        <pointmass name="Cargo Hold 3">
-            <weight unit="LBS">2000</weight>
-            <!-- MAX: 5384.414lbs -->
-            <location name="POINTMASS" unit="IN">
-                <x>849.1324</x>
-                <y>0</y>
-                <z>-29.5</z>
-            </location>
-        </pointmass>
-        <pointmass name="Cargo Hold 4">
-            <weight unit="LBS">1500</weight>
-            <!-- MAX: 4651.754lbs -->
-            <location name="POINTMASS" unit="IN">
-                <x>931.0653</x>
-                <y>0</y>
-                <z>-29.5</z>
-            </location>
-        </pointmass>
-        <pointmass name="Cargo Hold 5">
-            <weight unit="LBS">2000</weight>
-            <!-- MAX: 3300.320lbs -->
-            <location name="POINTMASS" unit="IN">
-                <x>1068.2634</x>
-                <y>0</y>
-                <z>0</z>
-                <!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-            </location>
-        </pointmass>
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
+			<location name="POINTMASS" unit="IN">
+				<x>646.00</x>
+				<y>0</y>
+				<z>0</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>
+		</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>
+		</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>
+		</pointmass>
     </mass_balance>
 
     <ground_reactions>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index a1cae8cb..9505e98c 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A320-main.xml b/A320-main.xml
index 166020f1..4d0eb0cb 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -378,52 +378,22 @@
 			<max-lb type="double">440</max-lb>
 		</weight>
 		<weight n="1">
-			<name>Cabin Crew</name>
+			<name>Passengers</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]" />
-			<min-lb type="double">300</min-lb>
-			<max-lb type="double">1320</max-lb>
+			<min-lb type="double">1500</min-lb>
+			<max-lb type="double">27000</max-lb>
 		</weight>
 		<weight n="2">
-			<name>PAX 0A (60 seats)</name>
+			<name>Forward Cargo</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]" />
 			<min-lb type="double">300</min-lb>
-			<max-lb type="double">13200</max-lb>
+			<max-lb type="double">8765</max-lb>
 		</weight>
 		<weight n="3">
-			<name>PAX 0B (60 seats)</name>
+			<name>Aft Cargo</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]" />
 			<min-lb type="double">300</min-lb>
-			<max-lb type="double">13200</max-lb>
-		</weight>
-		<weight n="4">
-			<name>PAX 0C (54 seats)</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]" />
-			<min-lb type="double">300</min-lb>
-			<max-lb type="double">11880</max-lb>
-		</weight>
-		<weight n="5">
-			<name>Cargo Hold 1</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[5]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">7500.126</max-lb>
-		</weight>
-		<weight n="6">
-			<name>Cargo Hold 3</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[6]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">5384.414</max-lb>
-		</weight>
-		<weight n="7">
-			<name>Cargo Hold 4</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[7]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">4651.754</max-lb>
-		</weight>
-		<weight n="8">
-			<name>Cargo Hold 5</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[8]" />
-			<min-lb type="double">0</min-lb>
-			<max-lb type="double">3300.320</max-lb>
+			<max-lb type="double">8765</max-lb>
 		</weight>
 	</payload>
 	
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 3950a1ef..5cb88741 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 0672af3a..c4b2b5d1 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml
index ffb376e4..e028812d 100644
--- a/A321-200-CFM.xml
+++ b/A321-200-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index 0a61790b..e04fc739 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml
index dffa9334..d1c1a0ee 100644
--- a/A321neo-CFM.xml
+++ b/A321neo-CFM.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/A321neo-PW.xml b/A321neo-PW.xml
index 30b912ee..86535e00 100644
--- a/A321neo-PW.xml
+++ b/A321neo-PW.xml
@@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<vtailarm  unit="FT" >   57.33 </vtailarm>
 
 	   <location name="AERORP" unit="IN">
-			<x> 670.00 </x>
+			<x> 655.00 </x>
 			<y> 0 </y>
 			<z> 0.00 </z>
 		</location>
@@ -63,15 +63,42 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			<z> 0.00 </z>
 		</location>
 
-		<pointmass name="Cockpit Crew">
-			<weight unit="LBS">400</weight>
-			<!-- MAX: 400lbs, two pilots-->
+		<pointmass name="Crew">
+			<weight unit="LBS">380</weight>
 			<location name="POINTMASS" unit="IN">
-				<x>200</x>
+				<x>646.00</x>
 				<y>0</y>
 				<z>0</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>
+		</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>
+		</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">
@@ -88,74 +115,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 				<z>-78.56019</z>
 			</location>
 		</pointmass>
-		<pointmass name="PAX 0A (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>470.1711</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0B (60 seats)">
-			<weight unit="LBS">6600</weight>
-			<!-- MAX: 13200lbs, 60 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>809.5669</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="PAX 0C (54 seats)">
-			<weight unit="LBS">5940</weight>
-			<!-- MAX: 11880lbs, 54 seats -->
-			<location name="POINTMASS" unit="IN">
-				<x>1163.2729</x>
-				<y>0</y>
-				<z>0</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 1">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 7500.126lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>383.4792</x>
-				<y>0</y>
-				<z>-29.5</z>
-				<!-- 1.5m and now half of it for the center point of the load -->
-			</location>
-		</pointmass>
-		<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
-		<pointmass name="Cargo Hold 3">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 5384.414lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>849.1324</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 4">
-			<weight unit="LBS">1500</weight>
-			<!-- MAX: 4651.754lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>931.0653</x>
-				<y>0</y>
-				<z>-29.5</z>
-			</location>
-		</pointmass>
-		<pointmass name="Cargo Hold 5">
-			<weight unit="LBS">2000</weight>
-			<!-- MAX: 3300.320lbs -->
-			<location name="POINTMASS" unit="IN">
-				<x>1068.2634</x>
-				<y>0</y>
-				<z>0</z>
-				<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
-			</location>
-		</pointmass>
-
-
 	</mass_balance>
 
 	<ground_reactions>
diff --git a/revision.txt b/revision.txt
index 46ad4b8e..c2af4839 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-1530
\ No newline at end of file
+1531
\ No newline at end of file