diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index 9b801d92..fc610a9b 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -19,9 +19,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<metrics>
 		<wingarea  unit="FT2"> 1319.79 </wingarea>
-		<wingspan  unit="FT" >  111.26 </wingspan>
+		<wingspan  unit="FT" >  117.26 </wingspan>
 		<wing_incidence      >    1.03 </wing_incidence>
-		<chord     unit="FT" >   13.76 </chord>
+		<chord     unit="FT" >   20.76 </chord>
 		<htailarea unit="FT2">  334.24 </htailarea>
 		<htailarm  unit="FT" >   57.88 </htailarm>
 		<vtailarea unit="FT2">  248.79 </vtailarea>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index 9b801d92..fc610a9b 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -19,9 +19,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<metrics>
 		<wingarea  unit="FT2"> 1319.79 </wingarea>
-		<wingspan  unit="FT" >  111.26 </wingspan>
+		<wingspan  unit="FT" >  117.26 </wingspan>
 		<wing_incidence      >    1.03 </wing_incidence>
-		<chord     unit="FT" >   13.76 </chord>
+		<chord     unit="FT" >   20.76 </chord>
 		<htailarea unit="FT2">  334.24 </htailarea>
 		<htailarm  unit="FT" >   57.88 </htailarm>
 		<vtailarea unit="FT2">  248.79 </vtailarea>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 29962d8b..6be41939 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -19,9 +19,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<metrics>
 		<wingarea  unit="FT2"> 1319.79 </wingarea>
-		<wingspan  unit="FT" >  111.26 </wingspan>
+		<wingspan  unit="FT" >  117.26 </wingspan>
 		<wing_incidence      >    1.03 </wing_incidence>
-		<chord     unit="FT" >   13.76 </chord>
+		<chord     unit="FT" >   20.76 </chord>
 		<htailarea unit="FT2">  334.24 </htailarea>
 		<htailarm  unit="FT" >   57.88 </htailarm>
 		<vtailarea unit="FT2">  248.79 </vtailarea>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 456dffdf..a233ac36 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -19,9 +19,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<metrics>
 		<wingarea  unit="FT2"> 1319.79 </wingarea>
-		<wingspan  unit="FT" >  111.26 </wingspan>
+		<wingspan  unit="FT" >  117.26 </wingspan>
 		<wing_incidence      >    1.03 </wing_incidence>
-		<chord     unit="FT" >   13.76 </chord>
+		<chord     unit="FT" >   20.76 </chord>
 		<htailarea unit="FT2">  334.24 </htailarea>
 		<htailarm  unit="FT" >   57.88 </htailarm>
 		<vtailarea unit="FT2">  248.79 </vtailarea>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index ace89e1f..2d0cfd83 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -19,9 +19,9 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 
 	<metrics>
 		<wingarea  unit="FT2"> 1319.79 </wingarea>
-		<wingspan  unit="FT" >  111.26 </wingspan>
+		<wingspan  unit="FT" >  117.26 </wingspan>
 		<wing_incidence      >    1.03 </wing_incidence>
-		<chord     unit="FT" >   13.76 </chord>
+		<chord     unit="FT" >   20.76 </chord>
 		<htailarea unit="FT2">  334.24 </htailarea>
 		<htailarm  unit="FT" >   57.88 </htailarm>
 		<vtailarea unit="FT2">  248.79 </vtailarea>
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index 8285823f..d15f56a9 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -1,4 +1,4 @@
-<!-- A3XX Aerodynamics -->
+<!-- Airbus A320 Aerodynamics -->
 <!-- Joshua Davidson (it0uchpods) -->
 
 <!--
@@ -12,7 +12,7 @@
 	<property value="0.0">ice/wing</property>
 	
 	<axis name="LIFT">
-
+		
 		<function name="aero/force/Lift_alpha">
 			<description>Lift due to alpha</description>
 			<product>
@@ -21,16 +21,56 @@
 				<table>
 					<independentVar lookup="row">aero/alpha-rad</independentVar>
 					<tableData>
-						-0.20 -0.900
-						 0.00  0.103
-						 0.15  1.600
-						 0.23  1.900
-						 0.60  1.000
+						-1.57 -1.4000
+						-1.22 -1.3512
+						-1.05 -1.2426
+						-0.88 -1.1575
+						-0.64 -1.0312
+						-0.25 -0.9379
+						 0.00  0.1494
+						 0.20  1.6072
+						 0.60  0.9705
+						 0.88  0.4415
+						 1.05  0.1294
+						 1.22  0.0544
+						 1.57  0.0000
 					</tableData>
 				</table>
 			</product>
 		</function>
-
+		
+		<function name="aero/force/Lift_pitch_rate">
+			<description>Lift due to pitch rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>velocities/q-aero-rad_sec</property>
+				<property>aero/ci2vel</property>
+				<value>8.5404</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Lift_alpha_rate">
+			<description>Lift due to alpha rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/alphadot-rad_sec</property>
+				<property>aero/ci2vel</property>
+				<value>2.9706</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Lift_elevator">
+			<description>Lift due to Elevator Deflection</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/pitch-pos-geared</property>
+				<value>0.4791</value>
+			</product>
+		</function>
+		
 		<function name="aero/force/Lift_flap">
 			<description>Delta Lift due to flaps</description>
 			<product>
@@ -39,94 +79,101 @@
 				<table>
 					<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
 					<tableData>
-						0.000  0.00000
-						0.290  0.00250
-						0.596  0.00700
-						0.645  0.01400
-						1.000  0.01800
+						0.000  0.0000
+						0.290  0.0648
+						0.596  0.1017
+						0.645  0.2404
+						1.000  0.2866
 					</tableData>
 				</table>
 			</product>
 		</function>
-
-		<function name="aero/force/Lift_slats">
+		
+		<function name="aero/force/Lift_slat">
 			<description>Delta Lift due to slats</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
-				<property>fcs/slat-pos-deg</property>
-				<value> 0.01000 </value>
+				<table>
+					<independentVar lookup="row">fcs/slat-pos-norm</independentVar>
+					<tableData>
+						0.000  0.0000
+						0.666  0.1734
+						0.814  0.2509
+						1.000  0.3113
+					</tableData>
+				</table>
 			</product>
 		</function>
-
+		
 		<function name="aero/force/Lift_speedbrake">
 			<description>Delta Lift due to speedbrake</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
 				<property>fcs/speedbrake-pos-norm</property>
-				<value>-0.15</value>
+				<value>-0.1</value>
 			</product>
 		</function>
-
-		<function name="aero/force/Lift_pitch_control">
-			<description>Lift due to pitch control deflection</description>
+		
+		<function name="aero/coefficient/CLicew">
+			<description>Lift_decrease_due_to_ice_on_wing</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
-				<property>fcs/pitch-pos-geared</property>
-				<value>0.04</value>
+				<table>
+					<independentVar>ice/wing</independentVar>
+					<tableData>
+						0.0  0.0
+						0.5 -0.1
+						1.0 -0.3
+						2.0 -1.5
+					</tableData>
+				</table>
 			</product>
 		</function>
-
-		<function name="aero/coefficient/CLicew">
-			<description>Lift_decrease_due_to_ice_on_wing</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar>ice/wing</independentVar>
-						<tableData>
-							0.0      0
-							0.5      -0.1
-							1.0      -0.3
-							2.0      -1.5
-						</tableData>
-					</table>
-				</product>
-		</function>
+	
 	</axis>
-
+	
 	<axis name="DRAG">
-
-		<function name="aero/force/Drag_basic">
-			<description>Drag at zero lift</description>
+		
+		<function name="aero/force/Drag_minimum">
+			<description>Minimum drag</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<value>0.0125</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Drag_alpha">
+			<description>Drag due to alpha</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
 				<table>
 					<independentVar lookup="row">aero/alpha-rad</independentVar>
 					<tableData>
-						-1.57    1.275
-						-0.26    0.025
-						 0.00    0.008
-						 0.26    0.025
-						 1.57    1.322
+						-1.57  1.2083
+						-0.20  0.0231
+						 0.00  0.0000
+						 0.20  0.0231
+						 1.57  1.2083
 					</tableData>
 				</table>
 			</product>
 		</function>
-
+		
 		<function name="aero/force/Drag_induced">
 			<description>Induced drag</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
 				<property>aero/cl-squared</property>
-				<value>0.036</value>
+				<value>0.0377</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/force/Drag_mach">
 			<description>Drag due to mach</description>
 			<product>
@@ -135,54 +182,15 @@
 				<table>
 					<independentVar lookup="row">velocities/mach</independentVar>
 					<tableData>
-						 0.00      0.000
-						 1.10      0.017
-						 1.80      0.015
+						0.00  0.000
+						0.79  0.000
+						1.10  0.023
+						1.80  0.015
 					</tableData>
 				</table>
 			</product>
 		</function>
-
-		<function name="aero/force/Drag_flap">
-			<description>Drag due to flaps</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/flap-pos-deg</property>
-				<value> 0.00120 </value>
-			</product>
-		</function>
-
-		<function name="aero/force/Drag_slats">
-			<description>Drag due to slats</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/slat-pos-deg</property>
-				<value> 0.00100 </value>
-			</product>
-		</function>
-
-		<function name="aero/force/Drag_gear">
-			<description>Drag due to gear</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>gear/gear-pos-norm</property>
-				<value>0.025</value>
-			</product>
-		</function>
-
-		<function name="aero/force/Drag_speedbrake">
-			<description>Drag due to speedbrakes</description>
-			<product>
-				<property>aero/qbar-psf</property>
-				<property>metrics/Sw-sqft</property>
-				<property>fcs/speedbrake-pos-norm</property>
-				<value>0.025</value>
-			</product>
-		</function>
-
+		
 		<function name="aero/force/Drag_beta">
 			<description>Drag due to sideslip</description>
 			<product>
@@ -191,71 +199,141 @@
 				<table>
 					<independentVar lookup="row">aero/beta-rad</independentVar>
 					<tableData>
-						-1.57    1.230
-						-0.26    0.050
-						 0.00    0.000
-						 0.26    0.050
-						 1.57    1.230
+						-1.57  1.23
+						-0.26  0.05
+						 0.00  0.00
+						 0.26  0.05
+						 1.57  1.23
 					</tableData>
 				</table>
 			</product>
 		</function>
-
-		<function name="aero/force/Drag_pitch_control">
-			<description>Drag due to pitch control deflection</description>
+		
+		<function name="aero/force/Drag_elevator">
+			<description>Drag due to Elevator Deflection</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
-				<abs><property>fcs/pitch-pos-rad</property></abs>
-				<value>0.07</value>
+				<abs><property>fcs/pitch-pos-geared</property></abs>
+				<value>0.04</value>
 			</product>
 		</function>
 		
-		<function name="aero/force/Drag_pitch_trim_control">
-			<description>Drag due to pitch trim control deflection</description>
+		<function name="aero/force/Drag_gear">
+			<description>Drag due to gear</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
-				<abs><property>fcs/pitch-trim-pos-rad</property></abs>
-				<value>0.07</value>
+				<property>gear/gear-pos-norm</property>
+				<value>0.0175</value>
 			</product>
 		</function>
-
+		
+		<function name="aero/force/Drag_flap">
+			<description>Drag due to flaps</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/flap-pos-deg</property>
+				<value>0.00125</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Drag_slat">
+			<description>Drag due to slats</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/slat-pos-deg</property>
+				<value>0.00125</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Drag_speedbrake">
+			<description>Drag due to speedbrake</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/speedbrake-pos-norm</property>
+				<value>0.0275</value>
+			</product>
+		</function>
+	
 	</axis>
-
+	
 	<axis name="SIDE">
-
+		
 		<function name="aero/force/Side_beta">
 			<description>Side force due to beta</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
 				<property>aero/beta-rad</property>
-				<value>-1</value>
+				<value>-0.8887</value>
 			</product>
 		</function>
-
-		<function name="aero/force/Drag_wingice">
-				<description>Drag_due_to_ice_on_wing</description>
-				<product>
-					<property>aero/qbar-psf</property>
-					<property>metrics/Sw-sqft</property>
-					<table>
-						<independentVar>ice/wing</independentVar>
-						<tableData>
-							0.0      0
-							0.5      0.004
-							1.0      0.010
-							2.0      0.100
-						</tableData>
-					</table>
-				</product>
+		
+		<function name="aero/force/Side_roll_rate">
+			<description>Side force due to roll rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/p-aero-rad_sec</property>
+				<table>
+					<independentVar lookup="row">aero/Re</independentVar>
+					<tableData>
+						25661346  0.2466
+						28227480  0.0178
+						38492020  0.0079
+						51187312  0.0045
+					</tableData>
+				</table>
+			</product>
 		</function>
 		
+		<function name="aero/force/Side_yaw_rate">
+			<description>Side force due to yaw rate</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>aero/bi2vel</property>
+				<property>velocities/r-aero-rad_sec</property>
+				<value>0.8709</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Side_rudder">
+			<description>Side force due to rudder</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<property>fcs/rudder-pos-rad</property>
+				<value>0.2653</value>
+			</product>
+		</function>
+		
+		<function name="aero/force/Drag_wingice">
+			<description>Drag_due_to_ice_on_wing</description>
+			<product>
+				<property>aero/qbar-psf</property>
+				<property>metrics/Sw-sqft</property>
+				<table>
+					<independentVar>ice/wing</independentVar>
+					<tableData>
+						0.0  0.000
+						0.5  0.004
+						1.0  0.010
+						2.0  0.100
+					</tableData>
+				</table>
+			</product>
+		</function>
+	
 	</axis>
-
+	
 	<axis name="ROLL">
-
+		
 		<function name="aero/moment/Roll_beta">
 			<description>Roll moment due to beta</description>
 			<product>
@@ -263,10 +341,18 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>aero/beta-rad</property>
-				<value>-0.05</value>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<independentVar lookup="column">aero/Re</independentVar>
+					<tableData>
+								 25661346 28227480 38492020 51187312
+						-0.0349 -0.1815  -0.0991  -0.0970  -0.1010
+						 0.3491 -1.6241  -0.3352  -0.3924  -0.6078
+					</tableData>
+				</table>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Roll_damp">
 			<description>Roll moment due to roll rate</description>
 			<product>
@@ -278,7 +364,7 @@
 				<value>-0.47</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Roll_yaw">
 			<description>Roll moment due to yaw rate</description>
 			<product>
@@ -287,10 +373,18 @@
 				<property>metrics/bw-ft</property>
 				<property>aero/bi2vel</property>
 				<property>velocities/r-aero-rad_sec</property>
-				<value>0.005</value>
+				<table>
+					<independentVar lookup="row">aero/alpha-rad</independentVar>
+					<independentVar lookup="column">aero/Re</independentVar>
+					<tableData>
+								 25661346 28227480 38492020 51187312
+						-0.0349  0.0028   0.0028   0.0028   0.0028
+						 0.3491  2.2829   0.2608   0.2608   0.2608
+					</tableData>
+				</table>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Roll_control">
 			<description>Roll moment due to roll control</description>
 			<product>
@@ -301,7 +395,7 @@
 				<value>0.110</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Roll_rudder">
 			<description>Roll moment due to rudder</description>
 			<product>
@@ -312,11 +406,11 @@
 				<value>0.01</value>
 			</product>
 		</function>
-
+	
 	</axis>
-
+	
 	<axis name="PITCH">
-
+		
 		<function name="aero/moment/Pitch_alpha">
 			<description>Pitch moment due to alpha</description>
 			<product>
@@ -324,10 +418,10 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/cbarw-ft</property>
 				<property>aero/alpha-rad</property>
-				<value>-0.6</value>
+				<value>-0.7918</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Pitch_control">
 			<description>Pitch moment due to pitch control</description>
 			<product>
@@ -338,7 +432,7 @@
 				<value>-1.825</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Pitch_trim_control">
 			<description>Pitch moment due to pitch trim control</description>
 			<product>
@@ -349,7 +443,7 @@
 				<value>-3.045</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Pitch_damp">
 			<description>Pitch moment due to pitch rate</description>
 			<product>
@@ -361,7 +455,7 @@
 				<value>-37.4</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Pitch_alphadot">
 			<description>Pitch moment due to alpha rate</description>
 			<product>
@@ -370,14 +464,14 @@
 				<property>metrics/cbarw-ft</property>
 				<property>aero/ci2vel</property>
 				<property>aero/alphadot-rad_sec</property>
-				<value>-1</value>
+				<value>-1.1356</value>
 			</product>
 		</function>
-
+	
 	</axis>
-
+	
 	<axis name="YAW">
-
+		
 		<function name="aero/moment/Yaw_beta">
 			<description>Yaw moment due to beta</description>
 			<product>
@@ -385,12 +479,12 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>aero/beta-rad</property>
-				<value>0.12</value>
+				<value>0.1292</value>
 			</product>
 		</function>
-
-		<function name="aero/moment/Yaw_damp">
-			<description>Yaw moment due to yaw rate</description>
+		
+		<function name="aero/moment/Yaw_roll_rate">
+			<description>Yaw moment due to roll rate</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
@@ -400,7 +494,7 @@
 				<value>-0.2</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Yaw_rudder">
 			<description>Yaw moment due to rudder</description>
 			<product>
@@ -411,17 +505,18 @@
 				<value>-0.043</value>
 			</product>
 		</function>
-
+		
 		<function name="aero/moment/Yaw_aileron">
 			<description>Adverse yaw</description>
 			<product>
 				<property>aero/qbar-psf</property>
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
-				<property>fcs/left-aileron-pos-rad</property>
+				<property>fcs/roll-pos-rad</property>
 				<value>0</value>
 			</product>
 		</function>
-
+	
 	</axis>
+
 </aerodynamics>