diff --git a/A319-200-IAE-set.xml b/A319-200-IAE-set.xml
index c6e7e85a..533b3545 100644
--- a/A319-200-IAE-set.xml
+++ b/A319-200-IAE-set.xml
@@ -13,9 +13,9 @@
 		<flight-model>jsb</flight-model>
 		<aero>A319-200-IAE</aero>
 		<model>
-			<path>Aircraft/A320Family/Models/A319-200.xml</path>
+			<path>Aircraft/A320Family/Models/A319-200-IAE.xml</path>
 			<livery>
-				<file>Liveries/A319/USAirwaysStar</file>
+				<file>USAirwaysStar</file>
 			</livery>
 		</model>
 
@@ -74,8 +74,6 @@
 		</menubar>
 	</sim>
 	
-	<engine-type>1</engine-type>
-	
 	<nasal>
 		<A320>
 			<file>Aircraft/A320Family/Nasal/engines.nas</file>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index dd6a1afc..6eec6d2d 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -13,9 +13,9 @@
 		<flight-model>jsb</flight-model>
 		<aero>A320-200-IAE</aero>
 		<model>
-			<path>Aircraft/A320Family/Models/A320-200.xml</path>
+			<path>Aircraft/A320Family/Models/A320-200-IAE.xml</path>
 			<livery>
-				<file>Liveries/A320/Airbus</file>
+				<file>Airbus</file>
 			</livery>
 		</model>
 
@@ -66,8 +66,6 @@
 		</menubar>
 	</sim>
 	
-	<engine-type>1</engine-type>
-	
 	<nasal>
 		<A320>
 			<file>Aircraft/A320Family/Nasal/engines.nas</file>
diff --git a/A320-main.xml b/A320-main.xml
index 50b8ae7e..a4ae3eaa 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -125,7 +125,6 @@
 			<generic>
 				<float n="0" alias="/controls/lighting/dome-norm" />
 				<float n="1" alias="/controls/lighting/interior" />
-				<float n="2" alias="/engine-type" />
 				<int n="2" alias="/controls/lighting/landing-lights[0]" />
 				<int n="3" alias="/controls/lighting/landing-lights[1]" />
 				<int n="4" alias="/controls/lighting/landing-lights[2]" />
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index e7084c5f..75b07ab9 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -13,9 +13,9 @@
 		<flight-model>jsb</flight-model>
 		<aero>A321-200-IAE</aero>
 		<model>
-			<path>Aircraft/A320Family/Models/A321-200.xml</path>
+			<path>Aircraft/A320Family/Models/A321-200-IAE.xml</path>
 			<livery>
-				<file>Liveries/A321/Airbus</file>
+				<file>Airbus</file>
 			</livery>
 		</model>
 
@@ -74,8 +74,6 @@
 		</menubar>
 	</sim>
 	
-	<engine-type>1</engine-type>
-	
 	<nasal>
 		<A320>
 			<file>Aircraft/A320Family/Nasal/engines.nas</file>
diff --git a/Models/A319-200.xml b/Models/A319-200-IAE.xml
similarity index 98%
rename from Models/A319-200.xml
rename to Models/A319-200-IAE.xml
index 1f045fd9..f009fa08 100644
--- a/Models/A319-200.xml
+++ b/Models/A319-200-IAE.xml
@@ -71,12 +71,6 @@
 
 	<model>
 		<path>Aircraft/A320Family/Models/Wings/a320.wings.iae.xml</path>
-		<condition>
-			<equals>
-				<property>/sim/multiplay/generic/float[2]</property>
-				<value>1</value>
-			</equals>
-		</condition>
 		<offsets>
 			<x-m>15.280</x-m>
 			<z-m>-1.06019</z-m>
diff --git a/Models/A320-200.xml b/Models/A320-200-IAE.xml
similarity index 98%
rename from Models/A320-200.xml
rename to Models/A320-200-IAE.xml
index 91e5af36..f6dbf927 100644
--- a/Models/A320-200.xml
+++ b/Models/A320-200-IAE.xml
@@ -72,12 +72,6 @@
 
 	<model>
 		<path>Aircraft/A320Family/Models/Wings/a320.wings.iae.xml</path>
-		<condition>
-			<equals>
-				<property>/sim/multiplay/generic/float[2]</property>
-				<value>1</value>
-			</equals>
-		</condition>
 		<offsets>
 			<x-m>15.280</x-m>
 			<z-m>-1.06019</z-m>
diff --git a/Models/A321-200.xml b/Models/A321-200-IAE.xml
similarity index 98%
rename from Models/A321-200.xml
rename to Models/A321-200-IAE.xml
index bb46fab7..91cbe996 100644
--- a/Models/A321-200.xml
+++ b/Models/A321-200-IAE.xml
@@ -71,12 +71,6 @@
 
 	<model>
 		<path>Aircraft/A320Family/Models/Wings/a320.wings.iae.xml</path>
-		<condition>
-			<equals>
-				<property>/sim/multiplay/generic/float[2]</property>
-				<value>1</value>
-			</equals>
-		</condition>
 		<offsets>
 			<x-m>15.280</x-m>
 			<z-m>-1.06019</z-m>
diff --git a/Nasal/fctl.nas b/Nasal/fctl.nas
index 5e8b2de2..b9dea143 100644
--- a/Nasal/fctl.nas
+++ b/Nasal/fctl.nas
@@ -2,6 +2,7 @@
 # In air, flaps 1 is slats only. On ground, it is slats and flaps.
 
 setprop("/controls/flight/flap-lever", 0);
+setprop("/controls/flight/flap-txt", " ");
 
 controls.flapsDown = func(step) {
 	if (step == 1) {
@@ -10,27 +11,32 @@ controls.flapsDown = func(step) {
 				setprop("/controls/flight/flaps", 0.290);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-txt", "1+F");
 				return;
 			} else {
 				setprop("/controls/flight/flaps", 0.000);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-txt", "1");
 				return;
 			}
 		} else if (getprop("/controls/flight/flap-lever") == 1) {
 			setprop("/controls/flight/flaps", 0.596);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 2);
+			setprop("/controls/flight/flap-txt", "2");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 2) {
 			setprop("/controls/flight/flaps", 0.645);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 3);
+			setprop("/controls/flight/flap-txt", "3");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 3) {
 			setprop("/controls/flight/flaps", 1.000);
 			setprop("/controls/flight/slats", 1.000);
 			setprop("/controls/flight/flap-lever", 4);
+			setprop("/controls/flight/flap-txt", "4");
 			return;
 		}
 	} else if (step == -1) {
@@ -38,28 +44,33 @@ controls.flapsDown = func(step) {
 			setprop("/controls/flight/flaps", 0.645);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 3);
+			setprop("/controls/flight/flap-txt", "3");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 3) {
 			setprop("/controls/flight/flaps", 0.596);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 2);
+			setprop("/controls/flight/flap-txt", "2");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 2) {
 			if (getprop("/velocities/airspeed-kt") <= 100) {
 				setprop("/controls/flight/flaps", 0.290);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-txt", "1+F");
 				return;
 			} else {
 				setprop("/controls/flight/flaps", 0.000);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-txt", "1");
 				return;
 			}
 		} else if (getprop("/controls/flight/flap-lever") == 1) {
 			setprop("/controls/flight/flaps", 0.000);
 			setprop("/controls/flight/slats", 0.000);
 			setprop("/controls/flight/flap-lever", 0);
+			setprop("/controls/flight/flap-txt", " ");
 			return;
 		}
 	} else {