diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
index 2ff9f8ba..fe5ba4ce 100644
--- a/A320-100-CFM-set.xml
+++ b/A320-100-CFM-set.xml
@@ -182,7 +182,6 @@
 		<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>
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index fc610a9b..1563346e 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</ground_reactions>
 
 	<propulsion>
-		<engine file="cfm56_5b4">
+		<engine file="cfm56_5a1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> -5.755 </y>
@@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 			</thruster>
 		</engine>
 
-		<engine file="cfm56_5b4">
+		<engine file="cfm56_5a1">
 			<location unit="M">
 				<x> 14.3962788 </x>
 				<y> 5.755 </y>
diff --git a/A320-main.xml b/A320-main.xml
index 7a15cf57..68eaf22f 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -726,7 +726,6 @@
 		<system n="0">
 			<keyboard-mode userarchive="y" type="bool">0</keyboard-mode>
 		</system>
-		<old-gpws type="bool">0</old-gpws>
 		<steep-ils type="bool">0</steep-ils>
 		<steep-ils-avail type="bool">0</steep-ils-avail>
 		<enable-ecam-actions>0</enable-ecam-actions>
diff --git a/Engines/cfm56_5a1.xml b/Engines/cfm56_5a1.xml
new file mode 100644
index 00000000..42062ede
--- /dev/null
+++ b/Engines/cfm56_5a1.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!--
+##############################################
+# Copyright (c) Joshua Davidson (it0uchpods) #
+##############################################
+-->
+
+<turbine_engine name="CFM56_5A1">
+
+	<milthrust>     25000 </milthrust>
+	<bypassratio>     8.1 </bypassratio>
+	<tsfc>            0.5 </tsfc>
+	<bleed>          0.03 </bleed>
+	<idlen1>         19.7 </idlen1>
+	<idlen2>         61.2 </idlen2>
+	<n1spinup>        0.2 </n1spinup>
+	<n2spinup>        1.0 </n2spinup>
+	<maxn1>         103.8 </maxn1>
+	<maxn2>         101.4 </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.0458  0.0378  0.0684  0.0619  0.0693  0.0000
+			0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
+			0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
+			0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
+			0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
+			1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+			</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.5640  0.3920  0.2710  0.0000
+			0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+			0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+			0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+			0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+			0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+			1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+			1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+			</tableData>
+		</table>
+	</function>
+	
+</turbine_engine>
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index 2efdd829..80b8978d 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -152,10 +152,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -190,10 +186,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -228,10 +220,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -266,10 +254,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -304,10 +288,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -342,10 +322,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -380,10 +356,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -418,10 +390,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -456,10 +424,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -494,10 +458,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -532,10 +492,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -570,10 +526,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -608,10 +560,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -660,569 +608,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</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>2</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-					<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>2500O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/2500.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</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>2450</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</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/IDG-A32X/Sounds/GPWS-OLD/2000.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</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>1950</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>1000O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/1000.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>1000</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>950</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>500O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/500.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>500</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>450</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>400O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/400.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>400</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>350</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>300O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/300.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>300</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>250</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>200O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/200.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>200</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>150</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>100O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/100.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>100</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>80</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>50O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/50.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>50</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>42</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>40O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/40.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>40</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>32</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>30O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/30.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>30</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>22</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>20O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/20.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>20</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>14</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>10O</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/10.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</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>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-					<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/IDG-A32X/Sounds/GPWS-OLD/5.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -1270,10 +655,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -1308,87 +689,6 @@
 			<mode>once</mode>
 			<condition>
 				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-						<value>0</value>
-					</equals>
-					<less-than-equals>
-						<property>/position/gear-agl-ft</property>
-						<value>250</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>200</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-		
-	    <gpws>
-			<name>100aboveO</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/100-above.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</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 soon -->
-						<property>/position/gear-agl-ft</property>
-						<value>350</value>
-					</less-than-equals>
-					<greater-than>
-						<property>/position/gear-agl-ft</property>
-						<value>300</value>
-					</greater-than>
-					<less-than>
-						<property>/position/gear-agl-ft-2-sec</property>
-						<property>/position/gear-agl-ft</property>
-					</less-than>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</gpws>
-	    <gpws>
-			<name>MinimumO</name>
-			<path>Aircraft/IDG-A32X/Sounds/GPWS-OLD/minimum.wav</path>
-			<mode>once</mode>
-			<condition>
-				<and>
-					<equals>
-						<property>/options/old-gpws</property>
-						<value>1</value>
-					</equals>
 					<equals>
 						<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
 						<value>0</value>
@@ -1429,92 +729,6 @@
 						<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>
-								<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>
-					<greater-than-equals>
-						<property>/systems/electrical/outputs/mk-viii</property>
-						<value>25</value>
-					</greater-than-equals>
-				</and>
-			</condition>
-			<volume>
-				<factor>8</factor>
-			</volume>
-			<reference-dist>20.0</reference-dist>
-			<max-dist>100.0</max-dist>
-		</retard>
-		<retard>
-			<name>retardO</name>
-			<path>Aircraft/IDG-A32X/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>
diff --git a/Sounds/GPWS-OLD/10.wav b/Sounds/GPWS-OLD/10.wav
deleted file mode 100644
index 8704a258..00000000
Binary files a/Sounds/GPWS-OLD/10.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/100-above.wav b/Sounds/GPWS-OLD/100-above.wav
deleted file mode 100644
index 5d79fed1..00000000
Binary files a/Sounds/GPWS-OLD/100-above.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/100.wav b/Sounds/GPWS-OLD/100.wav
deleted file mode 100644
index 7ebc3cd5..00000000
Binary files a/Sounds/GPWS-OLD/100.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/1000.wav b/Sounds/GPWS-OLD/1000.wav
deleted file mode 100644
index 117e5452..00000000
Binary files a/Sounds/GPWS-OLD/1000.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/20.wav b/Sounds/GPWS-OLD/20.wav
deleted file mode 100644
index 0f2bdd80..00000000
Binary files a/Sounds/GPWS-OLD/20.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/200.wav b/Sounds/GPWS-OLD/200.wav
deleted file mode 100644
index 9906732a..00000000
Binary files a/Sounds/GPWS-OLD/200.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/2000.wav b/Sounds/GPWS-OLD/2000.wav
deleted file mode 100644
index 9bbf4b5b..00000000
Binary files a/Sounds/GPWS-OLD/2000.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/2500.wav b/Sounds/GPWS-OLD/2500.wav
deleted file mode 100644
index 0393ca2b..00000000
Binary files a/Sounds/GPWS-OLD/2500.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/30.wav b/Sounds/GPWS-OLD/30.wav
deleted file mode 100644
index 654e7e07..00000000
Binary files a/Sounds/GPWS-OLD/30.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/300.wav b/Sounds/GPWS-OLD/300.wav
deleted file mode 100644
index 5542d440..00000000
Binary files a/Sounds/GPWS-OLD/300.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/40.wav b/Sounds/GPWS-OLD/40.wav
deleted file mode 100644
index 24e6dbe4..00000000
Binary files a/Sounds/GPWS-OLD/40.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/400.wav b/Sounds/GPWS-OLD/400.wav
deleted file mode 100644
index 334e8916..00000000
Binary files a/Sounds/GPWS-OLD/400.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/5.wav b/Sounds/GPWS-OLD/5.wav
deleted file mode 100644
index d5d2e54e..00000000
Binary files a/Sounds/GPWS-OLD/5.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/50.wav b/Sounds/GPWS-OLD/50.wav
deleted file mode 100644
index 19c76e36..00000000
Binary files a/Sounds/GPWS-OLD/50.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/500.wav b/Sounds/GPWS-OLD/500.wav
deleted file mode 100644
index 4f7d3fa4..00000000
Binary files a/Sounds/GPWS-OLD/500.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/minimum.wav b/Sounds/GPWS-OLD/minimum.wav
deleted file mode 100644
index 93ba6311..00000000
Binary files a/Sounds/GPWS-OLD/minimum.wav and /dev/null differ
diff --git a/Sounds/GPWS-OLD/retard.wav b/Sounds/GPWS-OLD/retard.wav
deleted file mode 100644
index db676ae4..00000000
Binary files a/Sounds/GPWS-OLD/retard.wav and /dev/null differ
diff --git a/revision.txt b/revision.txt
index 35d9e748..75a03b53 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4214
\ No newline at end of file
+4215
\ No newline at end of file