diff --git a/A320-main.xml b/A320-main.xml
index ce075367..b9fe2c2f 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1938,7 +1938,7 @@
 				<category-8 type="int">3</category-8>
 				<category-9 type="int">3</category-9> 
 				<category-10 type="int">6</category-10>
-				<category-13 type="int">7</category-13>
+				<category-13 type="int">6</category-13> <!-- Lamp Format 1 GPWS -->
 				<category-14 type="int">0</category-14>
 			</configuration-module>
 			<input-feeders>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index aa37f249..4a56a765 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -2603,12 +2603,22 @@
 		<condition>		
 			<or>
 				<property>controls/switches/annun-test</property>
-				<property>/instrumentation/mk-viii/outputs/discretes/gpws-alert</property>
 				<property>/instrumentation/mk-viii/outputs/discretes/gpws-warning</property>
 			</or>
 		</condition>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>gpws_gs_sw_gs_on</object-name>
+		<condition>		
+			<or>
+				<property>controls/switches/annun-test</property>
+				<property>/instrumentation/mk-viii/outputs/discretes/gpws-alert</property>
+			</or>
+		</condition>
+	</animation>
+	
 	<animation>
 		<type>pick</type>
 		<object-name>gpws_gs_sw</object-name>
@@ -2687,20 +2697,6 @@
 		</axis>
 	</animation>
 	
-	<animation>
-		<type>select</type>
-		<object-name>gpws_gs_sw_gs_on</object-name>
-		<condition>		
-			<or>
-				<property>controls/switches/annun-test</property>
-				<equals>
-					<property>/instrumentation/mk-viii/outputs/alert-mode</property>
-					<value>5</value>
-				</equals>
-			</or>
-		</condition>
-	</animation>
-	
 	<animation>
 		<type>select</type>
 		<object-name>atc_msg_on</object-name>