diff --git a/A320-main.xml b/A320-main.xml
index c4f7d5a6..960330c2 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1451,28 +1451,6 @@
 					<script>libraries.fovZoom(0);</script>
 				</binding>
 			</key>
-			<key n="33">
-				<name>PAGE UP</name>
-				<desc>Throttle Increase</desc>
-				<binding>
-					<command>nasal</command>
-					<script>
-						setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01);
-						setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01); # Not a typo, always use engine[0] as a reference
-					</script>
-				</binding>
-			</key>
-			<key n="34">
-				<name>PAGE DN</name>
-				<desc>Throttle Decrease</desc>
-				<binding>
-					<command>nasal</command>
-					<script>
-						setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01);
-						setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01); # Not a typo, always use engine[0] as a reference
-					</script>
-				</binding>
-			</key>
 			<key n="49">
 				<name>1</name>
 				<desc>Captain View/Elevator Trim Up</desc>
@@ -1531,8 +1509,7 @@
 					</condition>
 					<command>nasal</command>
 					<script>
-						setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01);
-						setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") - 0.01); # Not a typo, always use engine[0] as a reference
+						controls.incThrottle(-0.01, -1.0);
 					</script>
 				</binding>
 			</key>
@@ -1659,8 +1636,7 @@
 					</condition>
 					<command>nasal</command>
 					<script>
-						setprop("controls/engines/engine[0]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01);
-						setprop("controls/engines/engine[1]/throttle", getprop("controls/engines/engine[0]/throttle") + 0.01); # Not a typo, always use engine[0] as a reference
+						controls.incThrottle(0.01, 1.0);
 					</script>
 				</binding>
 			</key>
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index 476b99f6..81ffd2c3 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -305,86 +305,86 @@
 		</offsets>
 	</model>
 
-<!-- Tire smoke and spray effects -->
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-  <name>tyre-smoke-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
- </model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-  <name>tyre-smoke-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-  <name>tyre-smoke-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-  <name>rain-splash-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-  <name>rain-splash-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-  <name>rain-splash-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-  <name>tire-smoke-l</name>
+	<!-- Tire smoke and spray effects -->
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+	  <name>tyre-smoke-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	 </model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+	  <name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-  <name>tire-smoke-r</name>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+	  <name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
+	  <name>rain-splash-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
+	  <name>rain-splash-p</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+	  <name>rain-splash-s</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+	  <name>tire-smoke-l</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>-3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+	  <name>tire-smoke-r</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
 
 	<!-- Other non-aircraft models -->
 	<model>
@@ -399,40 +399,40 @@
 	
 	<!--Firetruck-->
 
-<model>
- <name>Firetruck1</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>60.0</x-m>
-  <y-m>10.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<model>
- <name>Firetruck2</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>80.0</x-m>
-  <y-m>-8.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<animation>
-    <type>select</type>
-    <object-name>Firetruck1</object-name>
-    <object-name>Firetruck2</object-name>
-    <condition>
-        <and>
-            <property>sim/animation/fire-services</property>
-            <less-than>
-                <property>velocities/groundspeed-kt</property>
-                <value>40</value>
-            </less-than>
-        </and>
-    </condition>
-</animation>
+	<model>
+	 <name>Firetruck1</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>60.0</x-m>
+	  <y-m>10.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<model>
+	 <name>Firetruck2</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>80.0</x-m>
+	  <y-m>-8.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<animation>
+	    <type>select</type>
+	    <object-name>Firetruck1</object-name>
+	    <object-name>Firetruck2</object-name>
+	    <condition>
+	        <and>
+	            <property>sim/animation/fire-services</property>
+	            <less-than>
+	                <property>velocities/groundspeed-kt</property>
+	                <value>40</value>
+	            </less-than>
+	        </and>
+	    </condition>
+	</animation>
 	
 	<!-- LIVERY SELECT -->
 	<!-- Animation -->
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index ceeb328a..732294f8 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -429,40 +429,40 @@
 	
 	<!--Firetruck-->
 
-<model>
- <name>Firetruck1</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>60.0</x-m>
-  <y-m>10.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<model>
- <name>Firetruck2</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>80.0</x-m>
-  <y-m>-8.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<animation>
-    <type>select</type>
-    <object-name>Firetruck1</object-name>
-    <object-name>Firetruck2</object-name>
-    <condition>
-        <and>
-            <property>sim/animation/fire-services</property>
-            <less-than>
-                <property>velocities/groundspeed-kt</property>
-                <value>40</value>
-            </less-than>
-        </and>
-    </condition>
-</animation>
+	<model>
+	 <name>Firetruck1</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>60.0</x-m>
+	  <y-m>10.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<model>
+	 <name>Firetruck2</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>80.0</x-m>
+	  <y-m>-8.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<animation>
+	    <type>select</type>
+	    <object-name>Firetruck1</object-name>
+	    <object-name>Firetruck2</object-name>
+	    <condition>
+	        <and>
+	            <property>sim/animation/fire-services</property>
+	            <less-than>
+	                <property>velocities/groundspeed-kt</property>
+	                <value>40</value>
+	            </less-than>
+	        </and>
+	    </condition>
+	</animation>
 	
 	<!-- LIVERY SELECT -->
 	<!-- Animation -->
diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
new file mode 100755
index 00000000..a9e1964c
--- /dev/null
+++ b/Models/Effects/Moisture.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+	<particlesystem>
+		<!-- <type>trail</type>-->
+		<name>moisture</name>
+		<texture>res/smoke.png</texture>
+		<emissive>false</emissive>
+		<lighting>false</lighting>
+		<offsets>
+			<x-m>3</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>-90</pitch-deg>
+		</offsets>
+		
+		<attach>local</attach>
+		
+		<placer>
+			<type>point</type>
+		</placer>
+		
+		<shooter>
+			<theta-min-deg>0</theta-min-deg>
+			<theta-max-deg>0</theta-max-deg>
+			<phi-min-deg>0</phi-min-deg>
+			<phi-max-deg>0</phi-max-deg>
+			<speed>
+				<value>0</value>
+				<spread>0</spread>
+			</speed>
+			<rotation-speed>
+				<x-min-deg-sec>0</x-min-deg-sec>
+				<y-min-deg-sec>0</y-min-deg-sec>
+				<z-min-deg-sec>0</z-min-deg-sec>
+				<x-max-deg-sec>0</x-max-deg-sec>
+				<y-max-deg-sec>0</y-max-deg-sec>
+				<z-max-deg-sec>0</z-max-deg-sec>
+			</rotation-speed>
+		</shooter>
+		
+		<counter>
+			<particles-per-sec>
+				<value>150</value>
+				<spread>0</spread>
+			</particles-per-sec>
+		</counter>
+		
+		<align>billboard</align>
+		
+		<particle>
+			<start>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>1.0</value>
+								<property>rendering/scene/diffuse/red</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>1.0</value>
+								<property>rendering/scene/diffuse/red</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>1.0</value>
+								<property>rendering/scene/diffuse/red</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<value>0.00000001</value>
+					</alpha>
+				</color>
+				<size>
+					<value>1</value>
+				</size>
+			</start>
+
+			<end>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.7</value>
+								<property>rendering/scene/diffuse/red</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.7</value>
+								<property>rendering/scene/diffuse/red</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.7</value>
+								<property>rendering/scene/diffuse/red</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<value>0.3</value>
+					</alpha>
+				</color>
+				<size>
+					<value>2</value>
+				</size>
+			</end>
+	
+			<life-sec><value>0.4</value></life-sec>
+			<mass-kg>0.4</mass-kg>
+			<radius-m>0.1</radius-m>
+		</particle>
+		
+		<program>
+			<fluid>air</fluid>
+			<gravity type="bool">true</gravity>
+			<wind type="bool">false</wind>
+		</program>
+		
+	</particlesystem>
+
+</PropertyList>
+
diff --git a/Models/Effects/contrail-eng1.xml b/Models/Effects/contrail.xml
similarity index 83%
rename from Models/Effects/contrail-eng1.xml
rename to Models/Effects/contrail.xml
index be18e0cc..36005fe4 100644
--- a/Models/Effects/contrail-eng1.xml
+++ b/Models/Effects/contrail.xml
@@ -3,7 +3,7 @@
 <PropertyList>
 	
 	<particlesystem>
-		<name>contrail-eng1</name>
+		<name>contrail</name>
 		<texture>res/smoke.png</texture>
 		<offsets>
 			<x-m>30</x-m>
@@ -13,26 +13,6 @@
 		</offsets>
 		<emissive type="bool">false</emissive>
 		<lighting type="bool">false</lighting>
-		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[0]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[0]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
-		</condition>
 		
 		<attach>world</attach>
 		
@@ -150,7 +130,7 @@
 		<program>
 			<fluid>air</fluid>
 			<gravity type="bool">true</gravity>
-			<wind typ="bool">true</wind>
+			<wind type="bool">true</wind>
 		</program>
 	</particlesystem>
 
diff --git a/Models/Effects/contrail-eng2.xml b/Models/Effects/engine-spray-reverse.xml
similarity index 79%
rename from Models/Effects/contrail-eng2.xml
rename to Models/Effects/engine-spray-reverse.xml
index 75da3646..bf48ae9b 100644
--- a/Models/Effects/contrail-eng2.xml
+++ b/Models/Effects/engine-spray-reverse.xml
@@ -3,37 +3,17 @@
 <PropertyList>
 	
 	<particlesystem>
-		<name>contrail-eng2</name>
+		<name>engine-spray-reverse</name>
 		<texture>res/smoke.png</texture>
-		<offsets>
-			<x-m>30</x-m>
-			<y-m>0.00</y-m>
-			<z-m>2</z-m>
-			<pitch-deg>90</pitch-deg>
-		</offsets>
 		<emissive type="bool">false</emissive>
 		<lighting type="bool">false</lighting>
-		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[1]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[1]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
-		</condition>
-		
+		<offsets>
+			<x-m>0</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>180</pitch-deg>
+		</offsets>				
+				
 		<attach>world</attach>
 		
 		<placer>
@@ -135,16 +115,16 @@
 					</alpha>
 				</color>
 				<size>
-					<value>6</value>
+					<value>3</value>
 				</size>
 			</end>
 
 			<life-sec>
-				<value>10</value>
+				<value>0.4</value>
 			</life-sec>
 
 			<mass-kg>0.5</mass-kg>
-			<radius-m>0.5</radius-m>
+			<radius-m>0.1</radius-m>
 		</particle>
 
 		<program>
@@ -154,4 +134,4 @@
 		</program>
 	</particlesystem>
 
-</PropertyList>
+</PropertyList>
\ No newline at end of file
diff --git a/Models/Effects/engine-spray.xml b/Models/Effects/engine-spray.xml
new file mode 100644
index 00000000..010a219f
--- /dev/null
+++ b/Models/Effects/engine-spray.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList>
+
+    <particlesystem>
+        <name>engine-spray</name>
+        <texture>res/smoke.png</texture>
+        <emissive>false</emissive>
+        <lighting>false</lighting>
+
+        <attach>world</attach>
+
+			<placer>
+				<type>segments</type>
+				<vertex>
+					<x-m>0</x-m>
+					<y-m>0</y-m>
+					<z-m>0</z-m>
+				</vertex>
+				<vertex>
+					<x-m>20</x-m>
+					<y-m>0</y-m>
+					<z-m>0</z-m>
+				</vertex>
+			</placer>
+
+        <shooter>
+            <theta-min-deg>15</theta-min-deg>
+            <theta-max-deg>60</theta-max-deg>
+            <phi-min-deg>-5</phi-min-deg>
+            <phi-max-deg>5</phi-max-deg>
+            <speed-mps>
+                <value>250</value>
+                <spread>15</spread>
+            </speed-mps>
+            <rotation-speed>
+                <x-max-deg-sec>15</x-max-deg-sec>
+                <x-min-deg-sec>-15</x-min-deg-sec>
+                <y-max-deg-sec>15</y-max-deg-sec>
+                <y-min-deg-sec>-15</y-min-deg-sec>
+                <z-max-deg-sec>15</z-max-deg-sec>
+                <z-min-deg-sec>-15</z-min-deg-sec>
+            </rotation-speed>
+        </shooter>
+
+        <counter>
+            <particles-per-sec>
+				<value>100</value>
+				<spread>10</spread>
+            </particles-per-sec>
+        </counter>
+
+        <align>billboard</align>
+
+        <particle>
+            <start>
+                <color>
+                    <red><value>0.9</value></red>
+                    <green><value>0.9</value></green>
+                    <blue><value>0.9</value></blue>
+                    <alpha><value>0.04</value></alpha>
+                </color>
+                <size>
+                    <value>0.5</value>
+                </size>
+            </start>
+            <end>
+                <color>
+                    <red><value>1</value></red>
+                    <green><value>1</value></green>
+                    <blue><value>1</value></blue>
+                    <alpha><value>0.02</value></alpha>
+                </color>
+                <size>
+                    <value>10</value>
+                </size>
+            </end>
+            <life-sec>
+                <value>1.0</value>
+            </life-sec>
+            <mass-kg>0.025</mass-kg>
+            <radius-m>0.175</radius-m>
+        </particle>
+
+        <program>
+            <fluid>air</fluid>
+            <gravity>true</gravity>
+            <wind>true</wind>
+        </program>
+
+	 </particlesystem>
+
+</PropertyList>
diff --git a/Models/Effects/pedestal-glare.png b/Models/Effects/pedestal-glare.png
index ee1f5de5..57c79eb1 100644
Binary files a/Models/Effects/pedestal-glare.png and b/Models/Effects/pedestal-glare.png differ
diff --git a/Models/Effects/tire-smoke-left.xml b/Models/Effects/tire-smoke-left.xml
index ab306b31..8e6f1828 100644
--- a/Models/Effects/tire-smoke-left.xml
+++ b/Models/Effects/tire-smoke-left.xml
@@ -5,7 +5,7 @@
 <PropertyList>
 
     <particlesystem>
-        <name>tyre-smoke-l</name>
+        <name>tire-smoke-l</name>
         <texture>tiresmoke.png</texture>
         <emissive>false</emissive>
         <lighting>false</lighting>
@@ -106,7 +106,7 @@
 
         <program>
             <fluid>air</fluid>
-            <gravity>false</gravity>
+            <gravity>true</gravity>
             <wind>true</wind>
         </program>
 
diff --git a/Models/Effects/tire-smoke-right.xml b/Models/Effects/tire-smoke-right.xml
index df2120d0..a7f2b6c8 100644
--- a/Models/Effects/tire-smoke-right.xml
+++ b/Models/Effects/tire-smoke-right.xml
@@ -5,7 +5,7 @@
 <PropertyList>
 
     <particlesystem>
-        <name>tyre-smoke-r</name>
+        <name>tire-smoke-r</name>
         <texture>tiresmoke.png</texture>
         <emissive>false</emissive>
         <lighting>false</lighting>
@@ -106,7 +106,7 @@
 
         <program>
             <fluid>air</fluid>
-            <gravity>false</gravity>
+            <gravity>true</gravity>
             <wind>true</wind>
         </program>
 
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index 7229a6bb..84d15040 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -48,8 +48,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng2.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[0]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[0]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -62,6 +82,130 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>60</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>4.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>0.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+ 
+<!-- ############### -->
+<!-- Tubofan Exhaust -->
+<!-- ############### 
+    <model>
+        <name>Left Tubofan Exhaust</name>
+        <path>Aircraft/A320-family/Models/Effects/Exhaust/Exhaust.xml</path>
+        <offsets>
+            <x-m>-7.0</x-m>
+            <y-m>-7.77</y-m>
+            <z-m>-4.4</z-m>
+            <pitch-deg>0</pitch-deg>
+        </offsets>
+    </model> -->
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
@@ -89,10 +233,10 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/engineLEAPl</inherits-from>
         <object-name>Nacelle</object-name>
         <object-name>Reverser</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index 97a55036..16498a1f 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -48,8 +48,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng2.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[1]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[1]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -62,6 +82,133 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>60</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>4.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>0.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+ 
+<!-- ############### -->
+<!-- Tubofan Exhaust -->
+<!-- ############### 
+    <model>
+        <name>Right Tubofan Exhaust</name>
+        <path>Aircraft/A320-family/Models/Effects/Exhaust/Exhaust.xml</path>
+        <offsets>
+            <x-m>-7.0</x-m>
+            <y-m> 7.77</y-m>
+            <z-m>-4.4</z-m>
+            <pitch-deg>0</pitch-deg>
+        </offsets>
+    </model> -->
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
@@ -89,10 +236,10 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/engineLEAPr</inherits-from>
         <object-name>Nacelle</object-name>
         <object-name>Reverser</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index 937da032..6f25c156 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -35,8 +35,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng1.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[0]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[0]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -49,6 +69,116 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>65</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>5.137</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>1.5</x-m>
+			<y-m>0</y-m>
+			<z-m>-1</z-m>
+		</offsets>
+	</model>
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
@@ -76,11 +206,11 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/enginePW1100L</inherits-from>
         <object-name>NacellePW1100G</object-name>
         <object-name>ReverserPW1100G</object-name>
         <object-name>SpoilersPW1100G</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index 24bf208c..880418f4 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -35,8 +35,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng2.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[1]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[1]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -49,6 +69,116 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>65</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>5.137</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>1.5</x-m>
+			<y-m>0</y-m>
+			<z-m>-1</z-m>
+		</offsets>
+	</model>
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
@@ -76,11 +206,11 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/enginePW1100R</inherits-from>
         <object-name>NacellePW1100G</object-name>
         <object-name>ReverserPW1100G</object-name>
         <object-name>SpoilersPW1100G</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml
index 87b802d8..db90d4f7 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml
@@ -37,8 +37,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng1.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[0]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[0]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -51,6 +71,116 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>65</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>4.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>0.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml
index 5d09a836..a09be013 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml
@@ -37,8 +37,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng2.xml</path>
+		<name>contrail</name>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[1]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[1]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -51,6 +71,116 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<name>moisture</name>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>60</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>4.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>0.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index 6cd58d18..c3ec8c37 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -34,8 +34,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng1.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>		
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[0]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[0]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -48,6 +68,116 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>65</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>4.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[0]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>0.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index 4f269703..82e9b2b9 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -34,8 +34,28 @@
 	</model>
 
 	<model>
-		<name>Contrail</name>
-		<path>Aircraft/A320-family/Models/Effects/contrail-eng2.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+		<name>contrail</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>engines/engine[1]/n2-actual</property>
+					<value>50</value>
+				</greater-than>
+				<greater-than>
+					<property>position/altitude-ft</property>
+					<value>19000</value>
+				</greater-than>
+				<less-than>
+					<property>environment/temperature-degc</property>
+					<value>-30</value>
+				</less-than>
+				<equals>
+					<property>engines/engine[1]/state</property>
+					<value>3</value>
+				</equals>
+			</and>
+		</condition>
 		<overlay>
 			<params>
 				<contrail alias="../../../../params/contrail" />
@@ -48,6 +68,116 @@
 		</offsets>
 	</model>
 
+	<!-- Takeoff/Landing Engine Moisture -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<name>moisture</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>60</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>-0.5</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<equals>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0</value>
+				</equals>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>4.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-5</z-m>
+		</offsets>
+	</model>
+
+	<!-- Takeoff/Landing Engine Reverse spray -->
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
+				</greater-than>
+				<greater-than>
+					<property>engines/engine[1]/reverser-pos-norm</property>
+					<value>0.75</value>
+				</greater-than>
+			</and>
+		</condition>
+		<offsets>
+			<x-m>0.875</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
diff --git a/Nasal/Systems/FADEC/engines-common.nas b/Nasal/Systems/FADEC/engines-common.nas
index b28ceb26..5bdf8b4b 100644
--- a/Nasal/Systems/FADEC/engines-common.nas
+++ b/Nasal/Systems/FADEC/engines-common.nas
@@ -100,23 +100,37 @@ var apuBleedChk = maketimer(0.1, func {
 
 # Various Other Stuff
 var doIdleThrust = func {
+	# Idle does not respect selected engines, because it is used to respond
+	# to "Retard" and both engines must be idle for spoilers to deploy
 	setprop("controls/engines/engine[0]/throttle", 0.0);
 	setprop("controls/engines/engine[1]/throttle", 0.0);
 }
 
 var doCLThrust = func {
-	setprop("controls/engines/engine[0]/throttle", 0.63);
-	setprop("controls/engines/engine[1]/throttle", 0.63);
+	if (getprop("sim/input/selected/engine[0]") == 1) {
+		setprop("controls/engines/engine[0]/throttle", 0.63);
+	}
+	if (getprop("sim/input/selected/engine[1]") == 1) {
+		setprop("controls/engines/engine[1]/throttle", 0.63);
+	}
 }
 
 var doMCTThrust = func {
-	setprop("controls/engines/engine[0]/throttle", 0.8);
-	setprop("controls/engines/engine[1]/throttle", 0.8);
+	if (getprop("sim/input/selected/engine[0]") == 1) {
+		setprop("controls/engines/engine[0]/throttle", 0.8);
+	}
+	if (getprop("sim/input/selected/engine[1]") == 1) {
+		setprop("controls/engines/engine[1]/throttle", 0.8);
+	}
 }
 
 var doTOGAThrust = func {
-	setprop("controls/engines/engine[0]/throttle", 1.0);
-	setprop("controls/engines/engine[1]/throttle", 1.0);
+	if (getprop("sim/input/selected/engine[0]") == 1) {
+		setprop("controls/engines/engine[0]/throttle", 1.0);
+	}
+	if (getprop("sim/input/selected/engine[1]") == 1) {
+		setprop("controls/engines/engine[1]/throttle", 1.0);
+	}
 }
 
 # Reverse Thrust System
@@ -124,15 +138,19 @@ var toggleFastRevThrust = func {
 	var state1 = getprop("systems/thrust/state1");
 	var state2 = getprop("systems/thrust/state2");
 	if (state1 == "IDLE" and state2 == "IDLE" and getprop("controls/engines/engine[0]/reverser") == "0" and getprop("controls/engines/engine[1]/reverser") == "0" and getprop("gear/gear[1]/wow") == 1 and getprop("gear/gear[2]/wow") == 1) {
-		interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
-		interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
-		setprop("controls/engines/engine[0]/reverser", 1);
-		setprop("controls/engines/engine[1]/reverser", 1);
-		setprop("controls/engines/engine[0]/throttle-rev", 0.65);
-		setprop("controls/engines/engine[1]/throttle-rev", 0.65);
-		setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
-		setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
-	} else if ((getprop("controls/engines/engine[0]/reverser") == "1") or (getprop("controls/engines/engine[1]/reverser") == "1") and (getprop("gear/gear[1]/wow") == 1) and (getprop("gear/gear[2]/wow") == 1)) {
+		if (getprop("sim/input/selected/engine[0]") == 1) {
+			interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
+			setprop("controls/engines/engine[0]/reverser", 1);
+			setprop("controls/engines/engine[0]/throttle-rev", 0.65);
+			setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
+		}
+		if (getprop("sim/input/selected/engine[1]") == 1) {
+			interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
+			setprop("controls/engines/engine[1]/reverser", 1);
+			setprop("controls/engines/engine[1]/throttle-rev", 0.65);
+			setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
+		}
+	} else if ((getprop("controls/engines/engine[0]/reverser") == "1") or (getprop("controls/engines/engine[1]/reverser") == "1")) {
 		setprop("controls/engines/engine[0]/throttle-rev", 0);
 		setprop("controls/engines/engine[1]/throttle-rev", 0);
 		interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
@@ -145,54 +163,59 @@ var toggleFastRevThrust = func {
 }
 
 var doRevThrust = func {
-	if (getprop("controls/engines/engine[0]/reverser") == "1" and getprop("controls/engines/engine[1]/reverser") == "1" and getprop("gear/gear[1]/wow") == 1 and getprop("gear/gear[2]/wow") == 1) {
-		var pos1 = getprop("controls/engines/engine[0]/throttle-rev");
-		var pos2 = getprop("controls/engines/engine[1]/throttle-rev");
-		if (pos1 < 0.649) {
-			setprop("controls/engines/engine[0]/throttle-rev", pos1 + 0.15);
+	if (getprop("gear/gear[1]/wow") != 1 and getprop("gear/gear[2]/wow") != 1) {
+		# Can't select reverse if not on the ground
+		return;
+	}
+	if (getprop("sim/input/selected/engine[0]") == 1 and getprop("controls/engines/engine[0]/reverser") == "1") {
+		var pos = getprop("controls/engines/engine[0]/throttle-rev");
+		if (pos < 0.649) {
+			setprop("controls/engines/engine[0]/throttle-rev", pos + 0.15);
 		}
-		if (pos2 < 0.649) {
-			setprop("controls/engines/engine[1]/throttle-rev", pos2 + 0.15);
+	}
+	if (getprop("sim/input/selected/engine[1]") == 1 and getprop("controls/engines/engine[1]/reverser") == "1") {
+		var pos = getprop("controls/engines/engine[1]/throttle-rev");
+		if (pos < 0.649) {
+			setprop("controls/engines/engine[1]/throttle-rev", pos + 0.15);
 		}
 	}
 	var state1 = getprop("systems/thrust/state1");
 	var state2 = getprop("systems/thrust/state2");
-	if (state1 == "IDLE" and state2 == "IDLE" and getprop("controls/engines/engine[0]/reverser") == "0" and getprop("controls/engines/engine[1]/reverser") == "0" and getprop("gear/gear[1]/wow") == 1 and getprop("gear/gear[2]/wow") == 1) {
+	if (getprop("sim/input/selected/engine[0]") == 1 and state1 == "IDLE" and getprop("controls/engines/engine[0]/reverser") == "0") {
 		setprop("controls/engines/engine[0]/throttle-rev", 0.05);
-		setprop("controls/engines/engine[1]/throttle-rev", 0.05);
 		interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
-		interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
 		setprop("controls/engines/engine[0]/reverser", 1);
-		setprop("controls/engines/engine[1]/reverser", 1);
 		setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
+	}
+	if (getprop("sim/input/selected/engine[1]") == 1 and state2 == "IDLE" and getprop("controls/engines/engine[1]/reverser") == "0") {
+		setprop("controls/engines/engine[1]/throttle-rev", 0.05);
+		interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
+		setprop("controls/engines/engine[1]/reverser", 1);
 		setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
 	}
 }
 
 var unRevThrust = func {
-	if (getprop("controls/engines/engine[0]/reverser") == "1" or getprop("controls/engines/engine[1]/reverser") == "1") {
-		var pos1 = getprop("controls/engines/engine[0]/throttle-rev");
-		var pos2 = getprop("controls/engines/engine[1]/throttle-rev");
-		if (pos1 > 0.051) {
-			setprop("controls/engines/engine[0]/throttle-rev", pos1 - 0.15);
+	if (getprop("sim/input/selected/engine[0]") == 1 and getprop("controls/engines/engine[0]/reverser") == "1") {
+		var pos = getprop("controls/engines/engine[0]/throttle-rev");
+		if (pos > 0.051) {
+			setprop("controls/engines/engine[0]/throttle-rev", pos - 0.15);
 		} else {
-			unRevThrust_b();
+			setprop("controls/engines/engine[0]/throttle-rev", 0);
+			interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
+			setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
+			setprop("controls/engines/engine[0]/reverser", 0);
 		}
-		if (pos2 > 0.051) {
-			setprop("controls/engines/engine[1]/throttle-rev", pos2 - 0.15);
+	}
+	if (getprop("sim/input/selected/engine[1]") == 1 and getprop("controls/engines/engine[1]/reverser") == "1") {
+		var pos = getprop("controls/engines/engine[1]/throttle-rev");
+		if (pos > 0.051) {
+			setprop("controls/engines/engine[1]/throttle-rev", pos - 0.15);
 		} else {
-			unRevThrust_b();
+			setprop("controls/engines/engine[1]/throttle-rev", 0);
+			interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
+			setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 0);
+			setprop("controls/engines/engine[1]/reverser", 0);
 		}
 	}
 }
-
-var unRevThrust_b = func {
-	setprop("controls/engines/engine[0]/throttle-rev", 0);
-	setprop("controls/engines/engine[1]/throttle-rev", 0);
-	interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
-	interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
-	setprop("fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
-	setprop("fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 0);
-	setprop("controls/engines/engine[0]/reverser", 0);
-	setprop("controls/engines/engine[1]/reverser", 0);
-}
diff --git a/Nasal/Systems/brakesystem.nas b/Nasal/Systems/brakesystem.nas
index 12bee9ce..91d089eb 100755
--- a/Nasal/Systems/brakesystem.nas
+++ b/Nasal/Systems/brakesystem.nas
@@ -75,6 +75,9 @@ var BrakeSystem =
 		setprop("gear/gear[2]/R3error-temp-degc", math.round(rand()*(5)) - 2.5);
 		setprop("gear/gear[2]/R4error-temp-degc", math.round(rand()*(5)) - 2.5);		  
 
+		#var atemp  =  getprop("environment/temperature-degc") or 0;
+		#var vmach  =  getprop("velocities/mach") or 0;
+		var tatdegc = getprop("/systems/navigation/probes/tat-1/compute-tat") or 0;
 		var atemp  =  getprop("environment/temperature-degc") or 0;
 		var vmach  =  getprop("velocities/mach") or 0;
 		var tatdegc = getprop("systems/navigation/probes/tat-1/compute-tat");
@@ -97,9 +100,10 @@ var BrakeSystem =
 		var RThermalEnergy = getprop("gear/gear[2]/Rbrake-thermal-energy");
 		var LBrakeLevel = getprop("fdm/jsbsim/fcs/left-brake-cmd-norm");
 		var RBrakeLevel = getprop("fdm/jsbsim/fcs/right-brake-cmd-norm");
-		var atemp  =  getprop("environment/temperature-degc") or 0;
-		var vmach  =  getprop("velocities/mach") or 0;
-		var tatdegc = atemp * (1 + (0.2 * math.pow(vmach, 2)));	
+		#var atemp  =  getprop("environment/temperature-degc") or 0;
+		#var vmach  =  getprop("velocities/mach") or 0;
+		#var tatdegc = atemp * (1 + (0.2 * math.pow(vmach, 2)));
+		var tatdegc = getprop("/systems/navigation/probes/tat-1/compute-tat") or 0;
 		var L_thrust_lb = getprop("engines/engine[0]/thrust_lb");
 		var R_thrust_lb = getprop("engines/engine[1]/thrust_lb");
 
@@ -150,14 +154,18 @@ var BrakeSystem =
 			{
 				L_thrust_lb = 1
 			}
-			L_Thrust = math.pow((math.log10(L_thrust_lb)),10)*0.0000000002;
+			#Disabling thrust computation on Brakes temperature
+			#L_Thrust = math.pow((math.log10(L_thrust_lb)),10)*0.0000000002;
+			L_Thrust = 0;
 
 			R_thrust_lb = math.abs(getprop("engines/engine[1]/thrust_lb"));
 			if (R_thrust_lb < 1)
 			{
 				R_thrust_lb = 1
 			}
-			R_Thrust = math.pow((math.log10(R_thrust_lb)),10)*0.0000000002;
+			#Disabling thrust computation on Brakes temperature
+			#R_Thrust = math.pow((math.log10(R_thrust_lb)),10)*0.0000000002;
+			R_Thrust = 0;
 
 			if (OnGround)
 			{
@@ -169,10 +177,7 @@ var BrakeSystem =
 				var V2_L = V1 - me.BrakeDecel * dt * LBrakeLevel;
 				var V2_R = V1 - me.BrakeDecel * dt * RBrakeLevel;
 				
-				#TODO - Adjust ThermalEnergy according to differential braking
-				#LBrakeLevel-RBrakeLevel
-				
-				LThermalEnergy += (Mass * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2);
+				LThermalEnergy += (Mass * getprop("gear/gear[1]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2);
 				if (getprop("services/chocks/left"))
 				{
 					if (!getprop("controls/gear/brake-parking"))
@@ -210,7 +215,7 @@ var BrakeSystem =
 					}
 				}
 
-				RThermalEnergy += (Mass * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2);
+				RThermalEnergy += (Mass * getprop("gear/gear[2]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2);
 				if (getprop("services/chocks/right"))
 				{
 					if (!getprop("controls/gear/brake-parking"))