diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
new file mode 100644
index 00000000..59f7ea53
--- /dev/null
+++ b/A320-100-CFM-set.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList include="A320-main.xml">
+
+	<sim>
+	
+		<sound>
+			<path>Aircraft/A320Family/Sounds/cfm56-sound.xml</path>
+		</sound>
+                <checklists include="A3XX-Checklists.xml"/>
+		<description>Airbus A320-111 (CFM56-5A1)</description>
+		<flight-model>jsb</flight-model>
+		<aero>A320-100-CFM</aero>
+		<model>
+			<path>Aircraft/A320Family/Models/A320-100-CFM.xml</path>
+			<livery>
+				<file>Airbus</file>
+			</livery>
+		</model>
+
+		<view>
+			<name>Pilot View</name>
+			<internal archive="y">true</internal>
+			<config>
+				<x-offset-m archive="y">-0.42</x-offset-m>
+				<y-offset-m archive="y">2.29</y-offset-m>
+				<z-offset-m archive="y">-13.75</z-offset-m>
+				<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
+				<default-field-of-view-deg type="double">60</default-field-of-view-deg>
+			</config>
+		</view>
+		<view n="103">
+			<name>Copilot View</name>
+			<type>lookfrom</type>
+			<internal archive="y">true</internal>
+			<config>
+				<from-model type="bool">true</from-model>
+				<x-offset-m archive="y">0.42</x-offset-m>
+				<y-offset-m archive="y">2.29</y-offset-m>
+				<z-offset-m archive="y">-13.75</z-offset-m>
+				<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
+				<default-field-of-view-deg type="double">60</default-field-of-view-deg>
+			</config>
+		</view>
+		<view n="104">
+			<name>Overhead Panel View</name>
+			<type>lookfrom</type>
+			<internal archive="y">true</internal>
+			<config>
+				<from-model type="bool">true</from-model>
+				<x-offset-m archive="y">0</x-offset-m>
+				<y-offset-m archive="y">2.3635023</y-offset-m>
+				<z-offset-m archive="y">-13.73</z-offset-m>
+				<pitch-offset-deg archive="y">40</pitch-offset-deg>
+				<default-field-of-view-deg type="double">85</default-field-of-view-deg>
+			</config>
+		</view>
+		<view n="105">
+			<name>Left Engine View</name>
+			<type>lookfrom</type>
+			<internal archive="y">false</internal>
+			<config>
+				<from-model type="bool">true</from-model>
+				<x-offset-m archive="y">-2.81</x-offset-m>
+				<y-offset-m archive="y">2.44</y-offset-m>
+				<z-offset-m archive="y">-6.49</z-offset-m>
+				<heading-offset-deg>129</heading-offset-deg>
+				<default-field-of-view-deg type="double">85</default-field-of-view-deg>
+			</config>
+		</view>
+		<view n="106">
+			<name>Right Wing View</name>
+			<type>lookfrom</type>
+			<internal archive="y">false</internal>
+			<config>
+				<from-model type="bool">true</from-model>
+				<x-offset-m archive="y">2.81</x-offset-m>
+				<y-offset-m archive="y">2.44</y-offset-m>
+				<z-offset-m archive="y">0</z-offset-m>
+				<heading-offset-deg>257</heading-offset-deg>
+				<default-field-of-view-deg type="double">85</default-field-of-view-deg>
+			</config>
+		</view>
+		<view n="107">
+			<name>Aft View</name>
+			<type>lookfrom</type>
+			<internal archive="y">false</internal>
+			<config>
+				<from-model type="bool">true</from-model>
+				<x-offset-m archive="y">-2.81</x-offset-m>
+				<y-offset-m archive="y">2.44</y-offset-m>
+				<z-offset-m archive="y">6.8</z-offset-m>
+				<heading-offset-deg>63</heading-offset-deg>
+				<default-field-of-view-deg type="double">85</default-field-of-view-deg>
+			</config>
+		</view>
+		
+		<systems n="0">
+            <autopilot n="0">
+                <path>Aircraft/A320Family/Systems/fadec-cfm.xml</path>
+            </autopilot>
+		</systems>
+		
+	</sim>
+	
+	<instrumentation n="0">
+		<mk-viii n="0">
+			<voice>
+				<file-prefix>Aircraft/A320Family/Sounds/GPWS-OLD/</file-prefix>
+			</voice>
+		</mk-viii>
+	</instrumentation>
+	
+	<options n="0">
+		<EIS2 type="bool">0</EIS2>
+		<eng>CFM</eng>
+		<maxblock>52.3</maxblock>
+		<old-gpws type="bool">1</old-gpws>
+	</options>
+	
+	<sharklet type="bool">0</sharklet>
+	
+	<MCDUC n="0">
+		<type>A320-111</type>
+		<eng>CFM56-5A1</eng>
+	</MCDUC>
+	
+	<nasal>
+		<specific>
+			<file>Aircraft/A320Family/Nasal/a320livery-cfm-100.nas</file>
+		</specific>
+	</nasal>
+</PropertyList>
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
new file mode 100644
index 00000000..75496d89
--- /dev/null
+++ b/A320-100-CFM.xml
@@ -0,0 +1,600 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
+<fdm_config name="A320family" version="2.0" release="BETA"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
+
+<fileheader>
+	<author>Joshua Davidson (it0uchpods)</author>
+	<version>Pre V1.0</version>
+	<description>A3XX FDE</description>
+</fileheader>
+
+<metrics>
+	<wingarea  unit="FT2"> 1319.79 </wingarea>
+	<wingspan  unit="FT" >  111.26 </wingspan>
+	<wing_incidence>          1.03 </wing_incidence>
+	<chord     unit="FT" >   13.76 </chord>
+	<htailarea unit="FT2">  334.24 </htailarea>
+	<htailarm  unit="FT" >   57.88 </htailarm>
+	<vtailarea unit="FT2">  248.79 </vtailarea>
+	<vtailarm  unit="FT" >   57.33 </vtailarm>
+
+	<!-- location name="AERORP" unit="IN">
+		<x> 642.122 </x>
+		<y> 0 </y>
+		<z> -25.2091 </z>
+	</location -->
+	<location name="AERORP" unit="IN">
+		<x> 700.00 </x>
+		<y> 0 </y>
+		<z> 0.00 </z>
+	</location>
+
+	<location name="EYEPOINT" unit="IN">
+		<x> 80 </x>
+		<y> -30 </y>
+		<z> 70 </z>
+	</location>
+
+	<location name="VRP" unit="IN">
+		<x> 661.1 </x>
+		<y> 0 </y>
+		<z> -37 </z>
+	</location>
+
+</metrics>
+
+<mass_balance>
+	<ixx unit="SLUG*FT2">    611903 </ixx>
+	<iyy unit="SLUG*FT2">   1735389 </iyy>
+	<izz unit="SLUG*FT2">   2301293 </izz> 
+<!--
+___________________A320_________A330__________A340
+BOW_____________178000________270000________283925
+SPAN______________144___________198___________209
+LENGTH____________153___________209___________209
+ROLL MOI_________1725000______5727777_______10613448
+PITCH MOI________2550000______19040141_______13904249
+YAW MOI_________3950000______23089847_______24848934
+
+	<ixx unit="SLUG*FT2">   2262183 </ixx>
+	<iyy unit="SLUG*FT2">   3172439 </iyy>
+	<izz unit="SLUG*FT2">   3337024 </izz>
+
+	<ixx unit="SLUG*FT2">1725000</ixx>
+	<iyy unit="SLUG*FT2">2550000</iyy>
+	<izz unit="SLUG*FT2">3950000</izz> -->
+
+	<ixy unit="SLUG*FT2">         0 </ixy>
+	<ixz unit="SLUG*FT2">         0 </ixz>
+	<iyz unit="SLUG*FT2">         0 </iyz>
+	<emptywt unit="LBS">80431</emptywt> <!-- #ref-1 page 67, WV016. 90927lbs - 5248x2 (engines)=80431lbs-->
+
+	<!-- 	#### PB: That makes no sense, the whole aircraft is 1479.1339 inches long. 650inches eqauls to about 43.95% MAC with the Airbus limits according to the AMM between 45% and 49%
+		Also: The z-axis is -41.73 inches under the zero line of the plane while the pressure point is only -25,91 under the same line and slightly ahead, that causes the plane to behave quite unstable
+	-->
+	<!-- location name="CG" unit="IN">
+		<! - -x> 642.122 </x- - >
+		<x> 650.122 </x><! - - At zero load of fuel and cargo/pax the CG goes to 642 - - >
+		<y> 0 </y>
+		<z> -41.7398 </z>
+	</location -->
+	<location name="CG" unit="IN">
+		<x> 652.00 </x>
+		<y> 0 </y>
+		<z> 0.00 </z>
+	</location>
+
+	<pointmass name="Cockpit Crew">
+		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
+		<location name="POINTMASS" unit="IN">
+			<x>200</x>
+			<y>0</y>
+			<z>0</z>
+		</location>
+	</pointmass>
+	<pointmass name="Cabin Crew">
+		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
+		<location name="POINTMASS" unit="IN">
+			<x>696</x>
+			<y>0</y>
+			<z>0</z>
+		</location>
+	</pointmass>
+	<pointmass name="PAX 0A (60 seats)">
+		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
+		<location name="POINTMASS" unit="IN">
+			<x>470.1711</x>
+			<y>0</y>
+			<z>0</z>
+		</location>
+	</pointmass>
+	<pointmass name="PAX 0B (60 seats)">
+		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
+		<location name="POINTMASS" unit="IN">
+			<x>809.5669</x>
+			<y>0</y>
+			<z>0</z>
+		</location>
+	</pointmass>
+	<pointmass name="PAX 0C (54 seats)">
+		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
+		<location name="POINTMASS" unit="IN">
+			<x>1163.2729</x>
+			<y>0</y>
+			<z>0</z>
+		</location>
+	</pointmass>
+	<pointmass name="Cargo Hold 1">
+		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
+		<location name="POINTMASS" unit="IN">
+			<x>383.4792</x>
+			<y>0</y>
+			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
+		</location>
+	</pointmass>
+	<!-- Cargo Hold 2 doesn't exist, that is the center tank -->
+	<pointmass name="Cargo Hold 3">
+		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
+		<location name="POINTMASS" unit="IN">
+			<x>849.1324</x>
+			<y>0</y>
+			<z>-29.5</z>
+		</location>
+	</pointmass>
+	<pointmass name="Cargo Hold 4">
+		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
+		<location name="POINTMASS" unit="IN">
+			<x>931.0653</x>
+			<y>0</y>
+			<z>-29.5</z>
+		</location>
+	</pointmass>
+	<pointmass name="Cargo Hold 5">
+		<weight unit="LBS">2000</weight> <!-- MAX: 3300.320lbs -->
+		<location name="POINTMASS" unit="IN">
+			<x>1068.2634</x>
+			<y>0</y>
+			<z>0</z>	<!-- Cargo Hold #5 sits higher on the range of the cabin deck, it's only loadable with lifter -->
+		</location>
+	</pointmass>
+
+
+</mass_balance>
+
+<ground_reactions>
+	<!-- REF-1 page 165 + 271  -->
+	<contact type="BOGEY" name="NOSE_LG">
+		<location unit="IN">
+			<x> 197.6772 </x>
+			<y> 0 </y>
+			<z> -137.9617 </z> 
+		</location>
+		<static_friction> 0.8 </static_friction>
+		<dynamic_friction> 0.5 </dynamic_friction>
+		<rolling_friction> 0.02 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
+		<max_steer unit="DEG"> 70 </max_steer> <!-- REF-1 page 133 -->
+		<brake_group> NONE </brake_group>
+		<retractable>1</retractable>
+	</contact>
+	<contact type="BOGEY" name="LEFT_MLG">
+		<location unit="IN">
+			<!--<x> 699.9243 </x>-->
+			<x> 695.3149 </x>
+			<y> -149.4094 </y>
+			<z> -150.4824 </z>
+		</location>
+<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+		<static_friction> 0.8 </static_friction>
+		<dynamic_friction> 0.5 </dynamic_friction>
+		<rolling_friction> 0.02 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> LEFT </brake_group>
+		<retractable>1</retractable>
+	</contact>
+	<contact type="BOGEY" name="RIGHT_MLG">
+		<location unit="IN">
+			<!-- <x> 697.3425 </x> It should be right left simetric
+			<x> 699.9243 </x> -->
+			<x> 695.3149 </x>
+			<y> 149.4094 </y>
+			<z> -150.4824 </z>
+		</location>
+<!-- 		<static_friction> 0.5 </static_friction>  WHAT??? less static than dinamyc friction?-->
+		<static_friction> 0.8 </static_friction>
+		<dynamic_friction> 0.5 </dynamic_friction>
+		<rolling_friction> 0.02 </rolling_friction>
+		<!--spring_coeff unit="LBS/FT"> 169785 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 33957 </damping_coeff-->
+		<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> RIGHT </brake_group>
+		<retractable>1</retractable>
+	</contact>
+
+	<contact type="STRUCTURE" name="NOSE_1">
+		<location unit="IN">
+			<x> 37.7953 </x>
+			<y> 0 </y>
+			<z> -38.1374 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="NOSE_2">
+		<location unit="IN">
+			<x> 128.1102 </x>
+			<y> 0 </y>
+			<z> -55.0271 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="CENTER_1">
+		<location unit="IN">
+			<x> 274.0157 </x>
+			<y> 0 </y>
+			<z> -60.0665 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="CENTER_2">
+		<location unit="IN">
+			<x> 930 </x>
+			<y> 0 </y>
+			<z> -60.0665 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+
+	<contact type="STRUCTURE" name="ENG_1">
+		<location unit="IN">
+			<x>589.735</x>	
+			<y>-226.575</y>
+			<z>-95.567</z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="ENG_2">
+		<location unit="IN">
+			<x>589.735</x>	
+			<y>226.575</y>
+			<z>-95.567</z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.5 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+
+
+	<contact type="STRUCTURE" name="TAIL_1">
+		<location unit="IN">
+			<x> 1097.9921 </x>
+			<y> 0 </y>
+			<z> -44.7722 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="TAIL_2">
+		<location unit="IN">
+			<x> 1225 </x>
+			<y> 0 </y>
+			<z> -18.8067 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="TAIL_3">
+		<location unit="IN">
+			<x> 1341.6142 </x>
+			<y> 0 </y>
+			<z> -10.2599 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="TAIL_4">
+		<location unit="IN">
+			<x> 1469.0945 </x>
+			<y> 0 </y>
+			<z> 47.4138 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 1 </dynamic_friction>
+		<rolling_friction> 1 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="WING_TIP_1">
+		<location unit="IN">
+			<x> 838.8898 </x>
+			<y> -667.5197 </y>
+			<z> 35.7926 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 0.4 </dynamic_friction>
+		<rolling_friction> 0.4 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+	<contact type="STRUCTURE" name="WING_TIP_2">
+		<location unit="IN">
+			<x> 838.8898 </x>
+			<y> 667.5197 </y>
+			<z> 35.7926 </z>
+		</location>
+		<static_friction> 1.0 </static_friction>
+		<dynamic_friction> 1 </dynamic_friction>
+		<rolling_friction> 1 </rolling_friction>
+		<spring_coeff unit="LBS/FT"> 50000 </spring_coeff>
+		<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
+		<max_steer unit="DEG"> 0.0 </max_steer>
+		<brake_group> NONE </brake_group>
+		<retractable>0</retractable>
+	</contact>
+</ground_reactions>
+
+<propulsion>
+
+	<engine file="cfm56_5a1">
+	<location unit="IN">
+		<x> 620.0683 </x>
+		<y> -226.575 </y>
+		<z> -45.567 </z>
+	</location>
+	<orient unit="DEG">
+		<roll> 0.0 </roll>
+		<pitch> 2.2 </pitch>
+		<yaw> 1 </yaw>
+	</orient>
+	<feed>7</feed>
+	<thruster file="direct">
+		<location unit="IN">
+		<x> 655.4820 </x>
+		<y> -226.575 </y>
+		<z> 0.000 </z>
+		</location>
+		<orient unit="DEG">
+		<roll> 0.0 </roll>
+		<pitch> 2.2 </pitch>
+		<yaw> 1 </yaw>
+		</orient>
+	</thruster>
+	</engine>
+
+	<engine file="cfm56_5a1">
+	<location unit="IN">
+		<x> 620.0683 </x>
+		<y> 226.575 </y>
+		<z> -45.567 </z>
+	</location>
+	<orient unit="DEG">
+		<roll> 0.0 </roll>
+		<pitch> 2.2 </pitch>
+		<yaw> -1 </yaw>
+	</orient>
+	<feed>8</feed>
+	<thruster file="direct">
+		<location unit="IN">
+		<x> 655.4820 </x>
+		<y> 226.575 </y>
+		<z> 0.000 </z>
+		</location>
+		<orient unit="DEG">
+		<roll> 0.0 </roll>
+		<pitch> 2.2 </pitch>
+		<yaw> -1 </yaw>
+		</orient>
+	</thruster>
+	</engine>
+
+
+	<tank type="FUEL">    <!-- Left Tank (Wing tip Ventilation Surge) 0 -->
+		<location unit="IN">
+			<x> 783.0709 </x>
+			<y> -574.4148 </y>
+			<z> 3.1080 </z>
+		</location>
+		<capacity unit="LBS"> 412 </capacity><!-- 1 percent of total capacity, needs 20C to be filled -->
+		<contents unit="LBS"> 0 </contents>
+		
+		<priority>4</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- Left Tank (Outer) 1 -->
+		<location unit="IN">
+			<x> 739.5669 </x>
+			<y> -457.4259 </y>
+			<z> -8.0898 </z>
+		</location>
+		<capacity unit="LBS"> 1520.00 </capacity><!-- correct by FCOM -->
+		<contents unit="LBS"> 1520 </contents><!-- outer filled first than inner -->
+		<standpipe unit="LBS">21</standpipe><!-- minimun fuel on pipes -->
+		<priority>2</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- Left Tank (Inner) 2 -->
+		<location unit="IN">
+			<x> 652.5591 </x>
+			<y> -236.2992 </y>
+			<z> -33.9470 </z>
+		</location>
+		<capacity unit="LBS"> 11982 </capacity><!-- correct by FCOM -->
+		<contents unit="LBS"> 4480 </contents>
+		<standpipe unit="LBS">31</standpipe><!-- minimun fuel on pipes -->
+		<priority>3</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- Center Tank 3 -->
+		<location unit="IN">
+			<x> 522.0473 </x>
+			<y> 0 </y>
+			<z> -47.0 </z>
+		</location>
+		<capacity unit="LBS"> 14281 </capacity><!-- correct by FCOM -->
+		<contents unit="LBS"> 0 </contents> <!-- wing tanks filled first -->
+		<standpipe unit="LBS">43</standpipe><!-- minimun fuel on pipes -->
+		<priority>1</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- Right Tank (Inner) 4 -->
+		<location unit="IN">
+			<x> 652.5591 </x>
+			<y> 236.2992 </y>
+			<z> -33.9470 </z>
+		</location>
+		<capacity unit="LBS"> 11982 </capacity><!-- correct by FCOM -->
+		<contents unit="LBS"> 4480 </contents>
+		<standpipe unit="LBS">31</standpipe><!-- minimum fuel on pipes -->
+		<priority>3</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- Right Tank (Outer) 5 -->
+		<location unit="IN">
+			<x> 739.5669 </x>
+			<y> 457.4259 </y>
+			<z> -8.0898 </z>
+		</location>
+		<capacity unit="LBS"> 1520 </capacity><!-- need review -->
+		<contents unit="LBS"> 1520 </contents><!-- outer tank filled first than inner tank -->
+		<standpipe unit="LBS">21</standpipe><!-- minimun fuel on pipes -->
+		<priority>2</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- Right Tank (Wing tip Ventilation Surge) 6 -->
+		<location unit="IN">
+			<x> 783.0709 </x>
+			<y> 574.4148 </y>
+			<z> 3.1080 </z>
+		</location>
+		<capacity unit="LBS"> 412 </capacity><!-- 1 percent of total fuel capacity, needs 20C-->
+		<contents unit="LBS"> 0 </contents>
+		<priority>4</priority>
+		<type>JET-A1</type>
+		<temperature>50</temperature>
+	</tank>
+	<tank type="FUEL">    <!-- LEFT FUEL PIPES (Engine 1 feed from this) -->
+		<location unit="IN">
+			<x>589.735</x>	
+			<y>-226.575</y>
+			<z>-45.567</z>
+		</location>
+		<capacity unit="LBS"> 100 </capacity><!-- need review -->
+		<contents unit="LBS"> 0 </contents>
+		<priority>1</priority>
+		<type>JET-A1</type>
+	</tank>
+	<tank type="FUEL">    <!-- RIGHT FUEL PIPES (Engine 2 feed from this) -->
+		<location unit="IN">
+			<x>589.735</x>	
+			<y>226.575</y>
+			<z>-45.567</z>
+		</location>
+		<capacity unit="LBS"> 100 </capacity><!-- need review -->
+		<contents unit="LBS"> 0 </contents>
+		<priority>1</priority>
+		<type>JET-A1</type>
+	</tank>
+</propulsion>
+
+<system file="pushback" />
+<system file="fuel" />
+<system file="glass-effect1" />
+<system file="it-fbw" />
+<system file="fmgc" />
+<system file="fcs" />
+
+<flight_control name="none"/>
+
+<aerodynamics file="Systems/a320-aerodynamics.xml" />
+
+<external_reactions>
+	<force name="pushback" frame="BODY">
+		<location unit="IN">
+			<x>294</x>
+			<y>0</y>
+			<z>-149</z>
+		</location>
+		<direction>
+			<x>1</x>
+			<y>0</y>
+			<z>0</z>
+		</direction>
+	</force>
+</external_reactions>
+</fdm_config>
diff --git a/A320-main.xml b/A320-main.xml
index f5a1ac94..8ef4b9cb 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -553,6 +553,7 @@
 		<pfd n="0">
 			<sidestick-pos userarchive="y" type="bool">0</sidestick-pos>
 		</pfd>
+		<old-gpws type="bool">0</old-gpws>
 	</options>
 	
 	<instrumentation n="0">
@@ -590,7 +591,7 @@
 		</nav-compass>
 
 		<!-- See http://wiki.flightgear.org/index.php/GPWS -->
-		<mk-viii>
+		<mk-viii n="0">
 			<serviceable type="bool">true</serviceable>
 			<configuration-module>
 				<category-1 type="int">255</category-1>
diff --git a/Engines/cfm56_5a1.xml b/Engines/cfm56_5a1.xml
new file mode 100644
index 00000000..1d269ac8
--- /dev/null
+++ b/Engines/cfm56_5a1.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<turbine_engine name="CFM56_5A1">
+  <milthrust>     27000 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
+  <bypassratio>     7.2 </bypassratio>
+  <tsfc>          0.412 </tsfc>
+  <bleed>          0.03 </bleed>
+  <idlen1>         22.4 </idlen1>
+  <idlen2>         60.9 </idlen2>
+  <n1spinup>        0.2 </n1spinup>
+  <n2spinup>        2.0 </n2spinup>
+  <maxn1>         105.8 </maxn1>
+  <maxn2>         102.1 </maxn2>
+  <augmented>         0 </augmented>
+  <injected>          0 </injected>
+
+  <function name="IdleThrust">
+   <table>
+    <independentVar lookup="row">velocities/mach</independentVar>
+    <independentVar lookup="column">atmosphere/density-altitude</independentVar>
+    <tableData>
+         -10000     0     10000   20000   30000   40000   50000
+     0.0  0.0430  0.0488  0.0528  0.0694  0.0899  0.1183  0.1467
+     0.2  0.0500  0.0501  0.0335  0.0544  0.0797  0.1049  0.1342
+     0.4  0.0040  0.0047  0.0020  0.0272  0.0595  0.0891  0.1203
+     0.6  0.0     0.0     0.0     0.0     0.0276  0.0718  0.1073
+     0.8  0.0     0.0     0.0     0.0     0.0474  0.0868  0.0900
+     1.0  0.0     0.0     0.0     0.0     0.0     0.0552  0.0800
+    </tableData>
+   </table>
+  </function>
+
+  <function name="MilThrust">
+   <table>
+    <independentVar lookup="row">velocities/mach</independentVar>
+    <independentVar lookup="column">atmosphere/density-altitude</independentVar>
+    <tableData>
+          -10000       0   10000   20000   30000   40000   50000
+     0.0   1.2600  1.0000  0.7400  0.5340  0.3720  0.2410  0.1490
+     0.2   1.1710  0.9340  0.6970  0.5060  0.3550  0.2310  0.1430
+     0.4   1.1500  0.9210  0.6920  0.5060  0.3570  0.2330  0.1450
+     0.6   1.1810  0.9510  0.7210  0.5320  0.3780  0.2480  0.1540
+     0.8   1.2580  1.0200  0.7820  0.5820  0.4170  0.2750  0.1600
+     0.9   1.2580  1.0200  0.7820  0.5820  0.4170  0.2750  0.0000
+     1.0   1.1810  0.9510  0.7210  0.5320  0.3780  0.0000  0.0000
+     1.2   1.1500  0.9210  0.6920  0.0000  0.0000  0.0000  0.0000
+     1.4   1.1710  0.9340  0.0000  0.0000  0.0000  0.0000  0.0000
+    </tableData>
+   </table>
+  </function>
+
+</turbine_engine>
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
new file mode 100644
index 00000000..88eb01fb
--- /dev/null
+++ b/Models/A320-100-CFM.xml
@@ -0,0 +1,525 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList>
+	<name>A320-100</name>
+	<path>empty.ac</path> <!-- Livery system on MP multimodel -->
+
+	<offsets>
+		<x-m>-18.8499</x-m>
+		<z-m>1.7005004</z-m>
+	</offsets>
+
+
+	<model>
+		<name>Fuselage</name>
+		<path>Aircraft/A320Family/Models/Fuselages/A320/fuselage.xml</path>
+
+	</model>		
+	<!-- Separate Flightdeck to fit the modified nose -->
+	<model>
+		<name>Flightdeck</name>
+		<path>Aircraft/A320Family/Models/FlightDeck/a320.flightdeck.xml</path>
+		<offsets>
+			<x-m>4.7881</x-m>
+			<z-m>0.2399</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Interior</name>
+		<path>Aircraft/A320Family/Models/Interior/a320.interior.xml</path>
+	</model>
+
+	<model>
+		<name>Nose Gear</name>
+		<path>Aircraft/A320Family/Models/LandingGears/a320.nlg.xml</path>
+		<offsets>
+			<x-m>7.83</x-m>
+			<!-- <z-m>-1.8306008</z-m> Didn't touch ground -->
+			<z-m>-2</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Main Gears.Left</name>
+		<path>Aircraft/A320Family/Models/LandingGears/a320.mlg.left.xml</path>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9469424</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Main Gears.Right</name>
+		<path>Aircraft/A320Family/Models/LandingGears/a320.mlg.right.xml</path>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9469424</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<path>Aircraft/A320Family/Models/Wings/a320.wings.cfm.xml</path>
+		<offsets>
+			<x-m>15.280</x-m>
+			<z-m>-1.06019</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Horizontal Stabilizer</name>
+		<path>Aircraft/A320Family/Models/Fuselages/A320/hstab.xml</path>
+		<offsets>
+			<x-m>34.1512207</x-m>
+			<pitch-deg>0.0</pitch-deg>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Vertical Stabilizer</name>
+		<path>Aircraft/A320Family/Models/Fuselages/A320/vstab.xml</path>
+		<offsets>
+			<x-m>32.2535728</x-m>
+		</offsets>
+	</model>
+	<!-- Lights -->
+	
+	<model>
+		<name>Left nav light</name>
+		<path>Aircraft/A320Family/Models/Lights/rednav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>-16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Left nav light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/rednav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>-16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Right nav light</name>
+		<path>Aircraft/A320Family/Models/Lights/greennav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Right nav light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/greennav.xml</path>
+		<offsets>
+			<x-m>22.93</x-m>
+			<y-m>16.5</y-m>
+			<z-m>0.25</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Left strobe light</name>
+		<path>Aircraft/A320Family/Models/Lights/strobe.xml</path>
+		<offsets>
+			<x-m>23.92</x-m>
+			<y-m>-17.3</y-m>
+			<z-m>0.47</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Left strobe light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml</path>
+		<offsets>
+			<x-m>23.92</x-m>
+			<y-m>-17.3</y-m>
+			<z-m>0.47</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Right strobe light</name>
+		<path>Aircraft/A320Family/Models/Lights/strobe.xml</path>
+		<offsets>
+			<x-m>23.92</x-m>
+			<y-m>17.23</y-m>
+			<z-m>0.47</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Right strobe light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml</path>
+		<offsets>
+			<x-m>23.92</x-m>
+			<y-m>17.23</y-m>
+			<z-m>0.47</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Top beacon light</name>
+		<path>Aircraft/A320Family/Models/Lights/beacon.xml</path>
+		<offsets>
+			<x-m>16.7</x-m>
+			<y-m>0</y-m>
+			<z-m>1.977</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Bottom beacon light</name>
+		<path>Aircraft/A320Family/Models/Lights/beacon.xml</path>
+		<offsets>
+			<x-m>18.2</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+		<name>Top beacon light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/beacon.xml</path>
+		<offsets>
+			<x-m>16.7</x-m>
+			<y-m>0</y-m>
+			<z-m>1.977</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Bottom beacon light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/beacon.xml</path>
+		<offsets>
+			<x-m>18.2</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Port landing light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/landinglightL.xml</path>
+		<offsets>
+			<x-m>15.9</x-m>
+			<y-m>-3.16</y-m>
+			<z-m>-1.4</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Nosegear landing light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/taxilight.xml</path>
+		<offsets>
+			<x-m>7.35</x-m>
+			<y-m>0</y-m>
+			<z-m>-2.5</z-m>
+		</offsets>
+	</model>
+
+	<model>
+		<name>Starboard landing light ALS</name>
+		<path>Aircraft/A320Family/Models/Lights/ALS/landinglightR.xml</path>
+		<offsets>
+			<x-m>15.9</x-m>
+			<y-m>3.16</y-m>
+			<z-m>-1.4</z-m>
+		</offsets>
+	</model>
+
+	<!-- Other non-aircraft models -->
+	<model>
+		<name>Pushback</name>
+		<path>Models/Airport/Pushback/Goldhofert.xml</path>
+		<offsets>
+			<x-m>5.55</x-m>
+			<y-m>0</y-m>
+			<z-m>-4.14</z-m>
+<!--			<x-m>7.55</x-m>
+			<y-m>0</y-m>
+			<z-m>-4.14</z-m> -->
+
+		</offsets>
+	</model>
+
+
+
+	<!-- LIVERY SELECT -->
+	<!-- Animation -->
+	<animation>
+		<type>material</type>
+		<!-- Fuselage -->
+		<object-name>Fuselage</object-name>
+		<object-name>Vstab</object-name>
+		<!-- Wings -->
+		<object-name>WingletL</object-name>
+		<object-name>WingletR</object-name>
+		<!-- Engines -->
+		<object-name>Intake</object-name>
+		<object-name>Nacelle</object-name>
+		<object-name>Reverser</object-name>
+		<!-- Fuselage -->
+		<property-base>sim/model/livery</property-base>
+		<texture-prop>texture</texture-prop>
+		<texture>a320.png</texture>
+	</animation>
+
+	<!-- Nasal code -->
+	<nasal>
+		<load>
+		 var livery_update = aircraft.livery_update.new("Aircraft/A320Family/Models/Liveries/A320/CFM-100");
+		</load>
+		<unload>
+		 livery_update.stop();
+		</unload>
+	</nasal>
+    
+    <!-- Fuel Truck -->
+    
+    <model>
+        <name>fuel-truck</name>
+        <path>Aircraft/A320Family/Models/Services/Fuel-Truck/Fuel_Truck_Short_VolvoFM.ac</path>
+        <condition>
+            <equals>
+                <property>/services/fuel-truck/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+			<x-m>31</x-m>
+			<y-m>-25</y-m>
+			<z-m>0.95</z-m>
+        </offsets>
+    </model>
+    
+    <animation>
+        <type>select</type>
+        <object-name>fuel_pipe</object-name>
+        <condition>
+            <equals>
+                <property>/services/fuel-truck/connect</property>
+                <value>1</value>
+            </equals>
+        </condition>
+    </animation>
+    
+    <animation>
+        <type>select</type>
+        <object-name>fuel_pipe_disconnected</object-name>
+        <condition>
+            <equals>
+                <property>/services/fuel-truck/connect</property>
+                <value>0</value>
+            </equals>
+        </condition>
+    </animation>
+    
+    <!-- De-icing Truck -->
+    
+    <model>
+        <name>de-ice-truck</name>
+        <path>Aircraft/A320Family/Models/Services/De-Icing/volvo_deicing_truck.xml</path>
+        <condition>
+            <equals>
+                <property>/services/deicing_truck/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>-3</x-m>
+            <y-m>9.5</y-m>
+            <z-m>-4</z-m>
+            <heading-deg>160</heading-deg>
+        </offsets>
+    </model>
+    
+    <!-- Catering Truck - 1st door -->
+    
+    <model>
+        <name>cater-truck</name>
+        <path>Aircraft/A320Family/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml</path>
+        <condition>
+            <equals>
+                <property>/services/catering/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>7.87</x-m>
+            <y-m>7.28</y-m>
+            <z-m>-3.70</z-m>
+            <heading-deg>100</heading-deg>
+        </offsets>
+    </model>
+    
+    <!-- Baggage Truck -->
+    
+    <model>
+        <name>baggage-truck</name>
+        <path>Aircraft/A320Family/Models/Services/Baggage/cargo_ramp.ac</path>
+        <condition>
+            <equals>
+                <property>/services/baggage/enable</property>
+                <value>1</value>
+            </equals>
+        </condition>
+		<offsets>
+			<x-m>11</x-m>
+			<y-m>0</y-m>
+			<z-m>0.5</z-m>            
+		</offsets>
+    </model>
+    
+    <!-- External Power -->
+    
+    <model>
+        <name>ext-pwr</name>
+        <path>Aircraft/A320Family/Models/Services/External-Power/ext-pwr-box.ac</path>
+        <condition>
+            <equals>
+                <property>/controls/switches/cart</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+			<x-m>5</x-m>
+			<y-m>2</y-m>
+			<z-m>0.5</z-m>
+        </offsets>
+    </model>
+    
+    <!-- Chocks -->
+    
+    <model>
+        <name>chock_nose</name>
+        <path>Aircraft/A320Family/Models/Services/Chocks/chock_nose.ac</path>
+        <condition>
+            <equals>
+                <property>/services/chokes/nose</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>23.5</x-m>
+            <z-m>1.25</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <name>chock_left</name>
+        <path>Aircraft/A320Family/Models/Services/Chocks/chock_left.ac</path>
+        <condition>
+            <equals>
+                <property>/services/chokes/left</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>15.5</x-m>
+            <y-m>1.18</y-m>
+            <z-m>1.25</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <name>chock_right</name>
+        <path>Aircraft/A320Family/Models/Services/Chocks/chock_right.ac</path>
+        <condition>
+            <equals>
+                <property>/services/chokes/right</property>
+                <value>1</value>
+            </equals>
+        </condition>
+        <offsets>
+            <x-m>15.5</x-m>
+            <y-m>-1.18</y-m>
+            <z-m>1.25</z-m>
+        </offsets>
+    </model>
+    <!-- Stairways -->
+    
+
+	<model>
+	 <path>Aircraft/A320Family/Models/Services/Stairs/stairs.xml</path>
+	 <name>l1</name>
+	 <offsets>
+	  <x-m>7.94</x-m>
+	  <y-m>-0.1</y-m>
+	  <z-m>-0.6</z-m>
+	  <heading-deg>-8</heading-deg>
+	 </offsets>
+	 <condition>
+	  <property>/services/stairs/l1</property>
+	 </condition>
+	</model>
+
+	<model>
+	 <path>Aircraft/A320Family/Models/Services/Stairs/stairs.xml</path>
+	 <name>l4</name>
+	 <offsets>
+	  <x-m>31.94</x-m>
+	  <y-m>0.4</y-m>
+	  <z-m>-0.6</z-m>
+	  <heading-deg>6</heading-deg>
+	 </offsets>
+	 <condition>
+	  <property>/services/stairs/l4</property>
+	 </condition>
+	</model>
+
+	<animation>
+    <type>select</type>
+    <object-name>Top beacon light</object-name>
+    <object-name>Bottom beacon light</object-name>
+    <object-name>Left nav light</object-name>
+    <object-name>Right nav light</object-name>
+    <object-name>Left strobe light</object-name>
+    <object-name>Right strobe light</object-name>
+    <condition>
+        <not>
+            <property>/sim/rendering/shaders/skydome</property>
+        </not>
+    </condition>
+</animation>
+<animation>
+    <type>select</type>
+    <object-name>Top beacon light ALS</object-name>
+    <object-name>Bottom beacon light ALS</object-name>
+    <object-name>Left nav light ALS</object-name>
+    <object-name>Right nav light ALS</object-name>
+    <object-name>Left strobe light ALS</object-name>
+    <object-name>Right strobe light ALS</object-name>
+    <object-name>Port landing light ALS</object-name>
+    <object-name>Nosegear landing light ALS</object-name>
+    <object-name>Starboard landing light ALS</object-name>
+    <condition>
+            <property>/sim/rendering/shaders/skydome</property>
+    </condition>
+</animation>
+ <animation>
+  <type>select</type>
+   <object-name>Nosegear landing light ALS</object-name>
+   <condition>
+    <and>
+	 <not>
+		<property>/sim/model/lights/nose-ldglight</property>
+		<value>0</value>
+	</not>
+     <greater-than>
+      <property>gear/gear/position-norm</property>
+      <value>0.1</value>
+     </greater-than>
+    </and>
+   </condition>
+ </animation>
+	
+</PropertyList>
diff --git a/Models/Liveries/A320/CFM-100/Airbus.png b/Models/Liveries/A320/CFM-100/Airbus.png
new file mode 100644
index 00000000..2b72f8bc
Binary files /dev/null and b/Models/Liveries/A320/CFM-100/Airbus.png differ
diff --git a/Models/Liveries/A320/CFM-100/Airbus.xml b/Models/Liveries/A320/CFM-100/Airbus.xml
new file mode 100644
index 00000000..e179173c
--- /dev/null
+++ b/Models/Liveries/A320/CFM-100/Airbus.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList>
+	<sim>
+		<model>
+			<livery>
+				<name>Airbus A320</name>
+				<texture>Liveries/A320/CFM/Airbus.png</texture>
+			</livery>
+		</model>
+	</sim>
+</PropertyList>
diff --git a/Nasal/FMGC.nas b/Nasal/FMGC.nas
index e0f2964e..38190cc6 100644
--- a/Nasal/FMGC.nas
+++ b/Nasal/FMGC.nas
@@ -167,22 +167,22 @@ var phasecheck = maketimer(0.2, func {
 	var flap = getprop("/controls/flight/flap-pos");
 	if (flap == 0) {
 		setprop("/FMGC/internal/overspeed", 338);
-		setprop("/FMGC/internal/minspeed", 204);
+		setprop("/FMGC/internal/minspeed", 202);
 	} else if (flap == 1) {
 		setprop("/FMGC/internal/overspeed", 216);
-		setprop("/FMGC/internal/minspeed", 188);
+		setprop("/FMGC/internal/minspeed", 184);
 	} else if (flap == 2) {
 		setprop("/FMGC/internal/overspeed", 207);
-		setprop("/FMGC/internal/minspeed", 171);
+		setprop("/FMGC/internal/minspeed", 169);
 	} else if (flap == 3) {
 		setprop("/FMGC/internal/overspeed", 189);
-		setprop("/FMGC/internal/minspeed", 159);
+		setprop("/FMGC/internal/minspeed", 156);
 	} else if (flap == 4) {
 		setprop("/FMGC/internal/overspeed", 174);
-		setprop("/FMGC/internal/minspeed", 149);
+		setprop("/FMGC/internal/minspeed", 147);
 	} else if (flap == 5) {
 		setprop("/FMGC/internal/overspeed", 163);
-		setprop("/FMGC/internal/minspeed", 139);
+		setprop("/FMGC/internal/minspeed", 135);
 	}
 });
 
diff --git a/Nasal/a320livery-cfm-100.nas b/Nasal/a320livery-cfm-100.nas
new file mode 100644
index 00000000..23f4a35b
--- /dev/null
+++ b/Nasal/a320livery-cfm-100.nas
@@ -0,0 +1 @@
+aircraft.livery.init("Aircraft/A320Family/Models/Liveries/A320/CFM-100");
\ No newline at end of file
diff --git a/README.md b/README.md
index f3dff5b3..cd701b9b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ Brought to you by:
 Present pack includes the following Airbus variants:
 - A319-112
 - A319-131
+- A320-111
 - A320-214
 - A320-232
 - A320-251N
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index cba390f9..eeed580e 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -74,6 +74,168 @@
 		</callout>
 		
 <!-- Custom GPWS -->
+	    <gpws>
+			<name>2500O</name>
+			<path>Aircraft/A320Family/Sounds/GPWS-OLD/altitude-2500.wav</path>
+			<mode>once</mode>
+			<condition>
+				<and>
+					<equals>
+						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>1</value>
+					</equals>
+					<less-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>2500</value>
+					</less-than-equals>
+					<greater-than>
+						<property>/position/gear-agl-ft</property>
+						<value>2400</value>
+					</greater-than>
+					<less-than>
+						<property>/it-autoflight/internal/vert-speed-fpm</property>
+						<value>0</value>
+					</less-than>
+				</and>
+			</condition>
+			<volume>
+				<factor>8</factor>
+			</volume>
+			<reference-dist>20.0</reference-dist>
+			<max-dist>100.0</max-dist>
+		</gpws>
+	    <gpws>
+			<name>2000O</name>
+			<path>Aircraft/A320Family/Sounds/GPWS-OLD/altitude-2000.wav</path>
+			<mode>once</mode>
+			<condition>
+				<and>
+					<equals>
+						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>1</value>
+					</equals>
+					<less-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>2000</value>
+					</less-than-equals>
+					<greater-than>
+						<property>/position/gear-agl-ft</property>
+						<value>1900</value>
+					</greater-than>
+					<less-than>
+						<property>/it-autoflight/internal/vert-speed-fpm</property>
+						<value>0</value>
+					</less-than>
+				</and>
+			</condition>
+			<volume>
+				<factor>8</factor>
+			</volume>
+			<reference-dist>20.0</reference-dist>
+			<max-dist>100.0</max-dist>
+		</gpws>
+	    <gpws>
+			<name>10ftalandO</name>
+			<path>Aircraft/A320Family/Sounds/GPWS-OLD/altitude-10ft.wav</path>
+			<mode>once</mode>
+			<condition>
+				<and>
+					<equals>
+						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>1</value>
+					</equals>
+					<greater-than>
+						<property>/controls/flight/flaps</property>
+						<value>0.640</value>
+					</greater-than>
+					<less-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>10</value>
+					</less-than-equals>
+					<greater-than>
+						<property>/position/gear-agl-ft</property>
+						<value>8</value>
+					</greater-than>
+					<less-than>
+						<property>/it-autoflight/internal/vert-speed-fpm</property>
+						<value>0</value>
+					</less-than>
+					<or>
+						<equals>
+							<property>/it-autoflight/output/ap1</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/it-autoflight/output/ap2</property>
+							<value>1</value>
+						</equals>
+					</or>
+				</and>
+			</condition>
+			<volume>
+				<factor>8</factor>
+			</volume>
+			<reference-dist>20.0</reference-dist>
+			<max-dist>100.0</max-dist>
+		</gpws>
+	    <gpws>
+			<name>5O</name>
+			<path>Aircraft/A320Family/Sounds/GPWS-OLD/altitude-5.wav</path>
+			<mode>once</mode>
+			<condition>
+				<and>
+					<equals>
+						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>1</value>
+					</equals>
+					<greater-than>
+						<property>/controls/flight/flaps</property>
+						<value>0.640</value>
+					</greater-than>
+					<less-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>5</value>
+					</less-than-equals>
+					<greater-than>
+						<property>/position/gear-agl-ft</property>
+						<value>3</value>
+					</greater-than>
+					<less-than>
+						<property>/it-autoflight/internal/vert-speed-fpm</property>
+						<value>0</value>
+					</less-than>
+					<equals>
+						<property>/controls/engines/engine[0]/throttle</property>
+						<value>0.0</value>
+					</equals>
+					<equals>
+						<property>/controls/engines/engine[1]/throttle</property>
+						<value>0.0</value>
+					</equals>
+				</and>
+			</condition>
+			<volume>
+				<factor>8</factor>
+			</volume>
+			<reference-dist>20.0</reference-dist>
+			<max-dist>100.0</max-dist>
+		</gpws>
 	    <gpws>
 			<name>2500</name>
 			<path>Aircraft/A320Family/Sounds/GPWS/altitude-2500.wav</path>
@@ -84,6 +246,10 @@
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
 					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>0</value>
+					</equals>
 					<less-than-equals>
 						<property>/position/gear-agl-ft</property>
 						<value>2500</value>
@@ -114,6 +280,10 @@
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
 					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>0</value>
+					</equals>
 					<less-than-equals>
 						<property>/position/gear-agl-ft</property>
 						<value>2000</value>
@@ -144,6 +314,10 @@
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
 					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>0</value>
+					</equals>
 					<greater-than>
 						<property>/controls/flight/flaps</property>
 						<value>0.640</value>
@@ -188,6 +362,10 @@
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
 					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>0</value>
+					</equals>
 					<greater-than>
 						<property>/controls/flight/flaps</property>
 						<value>0.640</value>
@@ -231,6 +409,10 @@
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
 					</equals>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>0</value>
+					</equals>
 					<less-than-equals> <!-- Until I add a calulation for minimums + 100, and add the ability to adjust DH, I'm keeping 350. Should be working within the next few builds -->
 						<property>/position/gear-agl-ft</property>
 						<value>350</value>
@@ -253,7 +435,84 @@
 		</gpws>
 	
 <!-- Retard Warning -->
-
+		<retard>
+			<name>retardO</name>
+			<path>Aircraft/A320Family/Sounds/GPWS-OLD/retard.wav</path>
+			<mode>looped</mode>
+			<condition>
+				<and>
+					<greater-than>
+						<property>/controls/flight/flaps</property>
+						<value>0.640</value>
+					</greater-than>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>1</value>
+					</equals>
+					<or>
+						<and>
+							<less-than>
+								<property>/position/gear-agl-ft</property>
+								<value>18</value>
+							</less-than>
+							<equals>
+								<property>/it-autoflight/output/ap1</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/it-autoflight/output/ap2</property>
+								<value>0</value>
+							</equals>
+						</and>
+						<and>
+							<less-than>
+								<property>/position/gear-agl-ft</property>
+								<value>8</value>
+							</less-than>
+							<or>
+								<equals>
+									<property>/it-autoflight/output/ap1</property>
+									<value>1</value>
+								</equals>
+								<equals>
+									<property>/it-autoflight/output/ap2</property>
+									<value>1</value>
+								</equals>
+							</or>
+						</and>
+					</or>
+					<greater-than>
+						<property>controls/engines/engine[0]/throttle</property>
+						<value>0.0</value>
+					</greater-than>
+					<greater-than>
+						<property>controls/engines/engine[1]/throttle</property>
+						<value>0.0</value>
+					</greater-than>
+					<less-than>
+						<property>controls/engines/engine[0]/throttle</property>
+						<value>0.80</value>
+					</less-than>
+					<less-than>
+						<property>controls/engines/engine[1]/throttle</property>
+						<value>0.80</value>
+					</less-than>
+					<not>
+						<property>/gear/gear[1]/wow</property>
+						<property>/gear/gear[2]/wow</property>
+					</not>
+					<less-than>
+						<property>velocities/airspeed-kt</property>
+						<value>160</value>
+					</less-than>
+				</and>
+			</condition>
+			<volume>
+				<factor>8</factor>
+			</volume>
+			<reference-dist>20.0</reference-dist>
+			<max-dist>100.0</max-dist>
+		</retard>
 			
 		<retard>
 			<name>retard</name>
@@ -265,6 +524,10 @@
 						<property>/controls/flight/flaps</property>
 						<value>0.640</value>
 					</greater-than>
+					<equals>
+						<property>/options/old-gpws</property>
+						<value>0</value>
+					</equals>
 					<or>
 						<and>
 							<less-than>
diff --git a/Sounds/GPWS-OLD/500-above.wav b/Sounds/GPWS-OLD/500-above.wav
new file mode 100644
index 00000000..a0b40540
Binary files /dev/null and b/Sounds/GPWS-OLD/500-above.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-10.wav b/Sounds/GPWS-OLD/altitude-10.wav
new file mode 100644
index 00000000..59c8e62a
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-10.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-100.wav b/Sounds/GPWS-OLD/altitude-100.wav
new file mode 100644
index 00000000..7ebc3cd5
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-100.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-1000.wav b/Sounds/GPWS-OLD/altitude-1000.wav
new file mode 100644
index 00000000..117e5452
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-1000.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-10ft.wav b/Sounds/GPWS-OLD/altitude-10ft.wav
new file mode 100644
index 00000000..8704a258
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-10ft.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-20.wav b/Sounds/GPWS-OLD/altitude-20.wav
new file mode 100644
index 00000000..0f2bdd80
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-20.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-200.wav b/Sounds/GPWS-OLD/altitude-200.wav
new file mode 100644
index 00000000..9906732a
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-200.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-2000.wav b/Sounds/GPWS-OLD/altitude-2000.wav
new file mode 100644
index 00000000..9bbf4b5b
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-2000.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-2500.wav b/Sounds/GPWS-OLD/altitude-2500.wav
new file mode 100644
index 00000000..0393ca2b
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-2500.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-30.wav b/Sounds/GPWS-OLD/altitude-30.wav
new file mode 100644
index 00000000..654e7e07
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-30.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-300.wav b/Sounds/GPWS-OLD/altitude-300.wav
new file mode 100644
index 00000000..5542d440
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-300.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-40.wav b/Sounds/GPWS-OLD/altitude-40.wav
new file mode 100644
index 00000000..24e6dbe4
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-40.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-400.wav b/Sounds/GPWS-OLD/altitude-400.wav
new file mode 100644
index 00000000..334e8916
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-400.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-5.wav b/Sounds/GPWS-OLD/altitude-5.wav
new file mode 100644
index 00000000..d5d2e54e
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-5.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-50.wav b/Sounds/GPWS-OLD/altitude-50.wav
new file mode 100644
index 00000000..19c76e36
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-50.wav differ
diff --git a/Sounds/GPWS-OLD/altitude-500.wav b/Sounds/GPWS-OLD/altitude-500.wav
new file mode 100644
index 00000000..4f7d3fa4
Binary files /dev/null and b/Sounds/GPWS-OLD/altitude-500.wav differ
diff --git a/Sounds/GPWS-OLD/application-data-base-failed.wav b/Sounds/GPWS-OLD/application-data-base-failed.wav
new file mode 100644
index 00000000..b7c57ae7
Binary files /dev/null and b/Sounds/GPWS-OLD/application-data-base-failed.wav differ
diff --git a/Sounds/GPWS-OLD/bank-angle-inop.wav b/Sounds/GPWS-OLD/bank-angle-inop.wav
new file mode 100644
index 00000000..0c4c8bac
Binary files /dev/null and b/Sounds/GPWS-OLD/bank-angle-inop.wav differ
diff --git a/Sounds/GPWS-OLD/bank-angle.wav b/Sounds/GPWS-OLD/bank-angle.wav
new file mode 100644
index 00000000..8dbde954
Binary files /dev/null and b/Sounds/GPWS-OLD/bank-angle.wav differ
diff --git a/Sounds/GPWS-OLD/callouts-inop.wav b/Sounds/GPWS-OLD/callouts-inop.wav
new file mode 100644
index 00000000..47e2ceeb
Binary files /dev/null and b/Sounds/GPWS-OLD/callouts-inop.wav differ
diff --git a/Sounds/GPWS-OLD/configuration-type-invalid.wav b/Sounds/GPWS-OLD/configuration-type-invalid.wav
new file mode 100644
index 00000000..3dfa69ab
Binary files /dev/null and b/Sounds/GPWS-OLD/configuration-type-invalid.wav differ
diff --git a/Sounds/GPWS-OLD/dont-sink.wav b/Sounds/GPWS-OLD/dont-sink.wav
new file mode 100644
index 00000000..8bd30e8a
Binary files /dev/null and b/Sounds/GPWS-OLD/dont-sink.wav differ
diff --git a/Sounds/GPWS-OLD/glideslope-inop.wav b/Sounds/GPWS-OLD/glideslope-inop.wav
new file mode 100644
index 00000000..0840c4ba
Binary files /dev/null and b/Sounds/GPWS-OLD/glideslope-inop.wav differ
diff --git a/Sounds/GPWS-OLD/glideslope.wav b/Sounds/GPWS-OLD/glideslope.wav
new file mode 100644
index 00000000..32db115d
Binary files /dev/null and b/Sounds/GPWS-OLD/glideslope.wav differ
diff --git a/Sounds/GPWS-OLD/gpws-inop.wav b/Sounds/GPWS-OLD/gpws-inop.wav
new file mode 100644
index 00000000..54b78da4
Binary files /dev/null and b/Sounds/GPWS-OLD/gpws-inop.wav differ
diff --git a/Sounds/GPWS-OLD/minimums.wav b/Sounds/GPWS-OLD/minimums.wav
new file mode 100644
index 00000000..93ba6311
Binary files /dev/null and b/Sounds/GPWS-OLD/minimums.wav differ
diff --git a/Sounds/GPWS-OLD/pull-up.wav b/Sounds/GPWS-OLD/pull-up.wav
new file mode 100644
index 00000000..7f1ea4ad
Binary files /dev/null and b/Sounds/GPWS-OLD/pull-up.wav differ
diff --git a/Sounds/GPWS-OLD/retard.wav b/Sounds/GPWS-OLD/retard.wav
new file mode 100644
index 00000000..db676ae4
Binary files /dev/null and b/Sounds/GPWS-OLD/retard.wav differ
diff --git a/Sounds/GPWS-OLD/sink-rate.wav b/Sounds/GPWS-OLD/sink-rate.wav
new file mode 100644
index 00000000..bb5e80a4
Binary files /dev/null and b/Sounds/GPWS-OLD/sink-rate.wav differ
diff --git a/Sounds/GPWS-OLD/terrain.wav b/Sounds/GPWS-OLD/terrain.wav
new file mode 100644
index 00000000..89e7bdd0
Binary files /dev/null and b/Sounds/GPWS-OLD/terrain.wav differ
diff --git a/Sounds/GPWS-OLD/too-low-flaps.wav b/Sounds/GPWS-OLD/too-low-flaps.wav
new file mode 100644
index 00000000..f7027fe9
Binary files /dev/null and b/Sounds/GPWS-OLD/too-low-flaps.wav differ
diff --git a/Sounds/GPWS-OLD/too-low-gear.wav b/Sounds/GPWS-OLD/too-low-gear.wav
new file mode 100644
index 00000000..8dbde954
Binary files /dev/null and b/Sounds/GPWS-OLD/too-low-gear.wav differ
diff --git a/Sounds/GPWS-OLD/too-low-terrain.wav b/Sounds/GPWS-OLD/too-low-terrain.wav
new file mode 100644
index 00000000..f3bb14fb
Binary files /dev/null and b/Sounds/GPWS-OLD/too-low-terrain.wav differ