diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml
index c68df8ee..315c65a5 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml
index c68df8ee..315c65a5 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index 03df8631..951a1c78 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index c68df8ee..315c65a5 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index c68df8ee..315c65a5 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 03df8631..951a1c78 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A320-main.xml b/A320-main.xml
index 0b95a001..2431e920 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -567,9 +567,9 @@
 			<dome-norm type="double">0</dome-norm>
 			<fcu-panel-knb type="double">0</fcu-panel-knb>
 			<fcu-panel-norm type="double">0</fcu-panel-norm>
-			<landing-lights n="0" type="int">0</landing-lights>
-			<landing-lights n="1" type="int">0</landing-lights>
-			<landing-lights n="2" type="int">0</landing-lights>
+			<landing-lights n="0" type="double">0</landing-lights>
+			<landing-lights n="1" type="double">0</landing-lights>
+			<landing-lights n="2" type="double">0</landing-lights>
 			<main-flood-knb type="double">0</main-flood-knb>
 			<main-flood-norm type="double">0</main-flood-norm>
 			<main-panel-knb type="double">0</main-panel-knb>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index e9917700..67b0d36e 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index eddbe032..7d0375cf 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml
index c68df8ee..315c65a5 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index 03df8631..951a1c78 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml
index e9917700..67b0d36e 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/A321neo-PW.xml b/A321neo-PW.xml
index eddbe032..7d0375cf 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="M">
-			<x> 19.4974 </x>
+			<x> 19.3974 </x>
 			<y> 0 </y>
 			<z> 0.19249 </z>
 		</location>
diff --git a/Systems/a318-aerodynamics.xml b/Systems/a318-aerodynamics.xml
index 6e801d21..6ff56784 100644
--- a/Systems/a318-aerodynamics.xml
+++ b/Systems/a318-aerodynamics.xml
@@ -262,7 +262,7 @@
 				<property>metrics/bw-ft</property>
 				<property>aero/bi2vel</property>
 				<property>velocities/p-aero-rad_sec</property>
-				<value>-0.91</value>
+				<value>-0.47</value>
 			</product>
 		</function>
 
@@ -285,7 +285,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/roll-pos-rad</property>
-				<value>0.11</value>
+				<value>0.10</value>
 			</product>
 		</function>
 
@@ -296,7 +296,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>0.003</value>
+				<value>0.01</value>
 			</product>
 		</function>
 
@@ -322,7 +322,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/cbarw-ft</property>
 				<property>fcs/pitch-pos-geared</property>
-				<value>-1.600</value>
+				<value>-1.350</value>
 			</product>
 		</function>
 
@@ -334,7 +334,7 @@
 				<property>metrics/cbarw-ft</property>
 				<property>aero/ci2vel</property>
 				<property>velocities/q-aero-rad_sec</property>
-				<value>-136</value>
+				<value>-37.4</value>
 			</product>
 		</function>
 
@@ -384,7 +384,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>-0.075</value>
+				<value>-0.1</value>
 			</product>
 		</function>
 
diff --git a/Systems/a319-aerodynamics.xml b/Systems/a319-aerodynamics.xml
index 6e801d21..6ff56784 100644
--- a/Systems/a319-aerodynamics.xml
+++ b/Systems/a319-aerodynamics.xml
@@ -262,7 +262,7 @@
 				<property>metrics/bw-ft</property>
 				<property>aero/bi2vel</property>
 				<property>velocities/p-aero-rad_sec</property>
-				<value>-0.91</value>
+				<value>-0.47</value>
 			</product>
 		</function>
 
@@ -285,7 +285,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/roll-pos-rad</property>
-				<value>0.11</value>
+				<value>0.10</value>
 			</product>
 		</function>
 
@@ -296,7 +296,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>0.003</value>
+				<value>0.01</value>
 			</product>
 		</function>
 
@@ -322,7 +322,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/cbarw-ft</property>
 				<property>fcs/pitch-pos-geared</property>
-				<value>-1.600</value>
+				<value>-1.350</value>
 			</product>
 		</function>
 
@@ -334,7 +334,7 @@
 				<property>metrics/cbarw-ft</property>
 				<property>aero/ci2vel</property>
 				<property>velocities/q-aero-rad_sec</property>
-				<value>-136</value>
+				<value>-37.4</value>
 			</product>
 		</function>
 
@@ -384,7 +384,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>-0.075</value>
+				<value>-0.1</value>
 			</product>
 		</function>
 
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index 6e801d21..6ff56784 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -262,7 +262,7 @@
 				<property>metrics/bw-ft</property>
 				<property>aero/bi2vel</property>
 				<property>velocities/p-aero-rad_sec</property>
-				<value>-0.91</value>
+				<value>-0.47</value>
 			</product>
 		</function>
 
@@ -285,7 +285,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/roll-pos-rad</property>
-				<value>0.11</value>
+				<value>0.10</value>
 			</product>
 		</function>
 
@@ -296,7 +296,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>0.003</value>
+				<value>0.01</value>
 			</product>
 		</function>
 
@@ -322,7 +322,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/cbarw-ft</property>
 				<property>fcs/pitch-pos-geared</property>
-				<value>-1.600</value>
+				<value>-1.350</value>
 			</product>
 		</function>
 
@@ -334,7 +334,7 @@
 				<property>metrics/cbarw-ft</property>
 				<property>aero/ci2vel</property>
 				<property>velocities/q-aero-rad_sec</property>
-				<value>-136</value>
+				<value>-37.4</value>
 			</product>
 		</function>
 
@@ -384,7 +384,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>-0.075</value>
+				<value>-0.1</value>
 			</product>
 		</function>
 
diff --git a/Systems/a321-aerodynamics.xml b/Systems/a321-aerodynamics.xml
index 6e801d21..6ff56784 100644
--- a/Systems/a321-aerodynamics.xml
+++ b/Systems/a321-aerodynamics.xml
@@ -262,7 +262,7 @@
 				<property>metrics/bw-ft</property>
 				<property>aero/bi2vel</property>
 				<property>velocities/p-aero-rad_sec</property>
-				<value>-0.91</value>
+				<value>-0.47</value>
 			</product>
 		</function>
 
@@ -285,7 +285,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/roll-pos-rad</property>
-				<value>0.11</value>
+				<value>0.10</value>
 			</product>
 		</function>
 
@@ -296,7 +296,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>0.003</value>
+				<value>0.01</value>
 			</product>
 		</function>
 
@@ -322,7 +322,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/cbarw-ft</property>
 				<property>fcs/pitch-pos-geared</property>
-				<value>-1.600</value>
+				<value>-1.350</value>
 			</product>
 		</function>
 
@@ -334,7 +334,7 @@
 				<property>metrics/cbarw-ft</property>
 				<property>aero/ci2vel</property>
 				<property>velocities/q-aero-rad_sec</property>
-				<value>-136</value>
+				<value>-37.4</value>
 			</product>
 		</function>
 
@@ -384,7 +384,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>-0.075</value>
+				<value>-0.1</value>
 			</product>
 		</function>
 
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index 55bdf4a8..8572a9c4 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -117,7 +117,7 @@
 			</expression>
 		</input>
 		<output>/controls/flight/aileron-input</output>
-		<max-rate-of-change>2.0</max-rate-of-change>
+		<max-rate-of-change>1.5</max-rate-of-change>
 	</filter>
 
 	<filter>
@@ -314,7 +314,7 @@
 			</expression>
 		</input>
 		<output>/controls/flight/elevator-input</output>
-		<max-rate-of-change>2.0</max-rate-of-change>
+		<max-rate-of-change>1.5</max-rate-of-change>
 	</filter>
 
  <!-- =============================================================== -->
@@ -446,7 +446,7 @@
 			<expression>
 				<table>
 					<property>/velocities/mach</property>
-					<entry><ind>0.2</ind><dep>0.11</dep></entry>
+					<entry><ind>0.2</ind><dep>0.12</dep></entry>
 					<entry><ind>0.9</ind><dep>0.06</dep></entry>
 				</table>
 			</expression>
@@ -454,6 +454,22 @@
 		<output>/it-fbw/roll-kp</output>
 	</filter>
 	
+	<filter>
+		<name>IT-FBW: ROLL TI (I Time)</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/velocities/mach</property>
+					<entry><ind>0.2</ind><dep>0.75</dep></entry>
+					<entry><ind>0.9</ind><dep>0.65</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/it-fbw/roll-ti</output>
+	</filter>
+	
 	<pid-controller>
 		<name>IT-FBW: ROLL</name>
 		<debug>false</debug>
@@ -491,8 +507,10 @@
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
-			<Ti>0.45</Ti>
-			<Td>0.002</Td>
+			<Ti>
+				<property>/it-fbw/roll-ti</property>
+			</Ti>
+			<Td>0.005</Td>
 			<u_min>-1</u_min>
 			<u_max>1</u_max>
 		</config>
@@ -864,7 +882,7 @@
 			<expression>
 				<table>
 					<property>/velocities/mach</property>
-					<entry><ind>0.2</ind><dep>-0.20</dep></entry>
+					<entry><ind>0.2</ind><dep>-0.26</dep></entry>
 					<entry><ind>0.9</ind><dep>-0.13</dep></entry>
 				</table>
 			</expression>
@@ -872,6 +890,22 @@
 		<output>/it-fbw/pitch-kp</output>
 	</filter>
 	
+	<filter>
+		<name>IT-FBW: PITCH TI (I Time)</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/velocities/mach</property>
+					<entry><ind>0.2</ind><dep>0.75</dep></entry>
+					<entry><ind>0.9</ind><dep>0.55</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/it-fbw/pitch-ti</output>
+	</filter>
+	
 	<pid-controller>
 		<name>IT-FBW: PITCH</name>
 		<debug>false</debug>
@@ -947,8 +981,10 @@
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
-			<Ti>0.45</Ti>
-			<Td>0.002</Td>
+			<Ti>
+				<property>/it-fbw/pitch-ti</property>
+			</Ti>
+			<Td>0.005</Td>
 			<u_min>-1</u_min>
 			<u_max>1</u_max>
 		</config>
@@ -1032,8 +1068,10 @@
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
-			<Ti>0.45</Ti>
-			<Td>0.02</Td>
+			<Ti>
+				<property>/it-fbw/pitch-ti</property>
+			</Ti>
+			<Td>0.03</Td>
 			<u_min>-1</u_min>
 			<u_max>1</u_max>
 		</config>
diff --git a/revision.txt b/revision.txt
index b19e196a..a57db8f5 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-3028
\ No newline at end of file
+3040
\ No newline at end of file