diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 9e3a3e04..1b00c24a 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -1521,7 +1521,39 @@
 	<!-- Cocktpit Door Switch  -->
 	
 	<animation>
-		<type>knob</type>
+		<type>slider</type>
+		<object-name>CockpitDoorSwitch</object-name>
+		<object-name>CockpitDoorSwitch.mark</object-name>
+        <property>controls/doors/doorc-switch</property>
+		<drag-direction>vertical</drag-direction>
+		<action>		
+			<binding>	
+				<command>property-adjust</command>
+				<property>controls/doors/doorc-switch</property>
+				<factor>-1</factor>
+				<min>-1</min>
+				<max>1</max>
+				<wrap>0</wrap>
+			</binding>		
+		</action>
+		<release>		
+			<binding>	
+				<command>property-assign</command>
+				<property>controls/doors/doorc-switch</property>
+				<value>0</value>
+			</binding>
+		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>doorc-switch-lock</tooltip-id>
+				<label>Cockpit door switch</label>
+			</binding>
+		</hovered>		
+	</animation>
+
+	<animation>
+		<type>rotate</type>
 		<object-name>CockpitDoorSwitch</object-name>
 		<object-name>CockpitDoorSwitch.mark</object-name>
         <property>controls/doors/doorc-switch</property>
@@ -1533,38 +1565,6 @@
 		<axis>
 			<object-name>CockpitDoorSwitch.axis</object-name>
 		</axis>
-		<action>		
-			<binding>	
-				<command>property-cycle</command>
-				<property>controls/doors/doorc-switch</property>
-				<value>-1</value>
-				<value>0</value>
-				<value>1</value>
-				<wrap>false</wrap>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<release>		
-			<binding>	
-				<command>property-assign</command>
-				<property>controls/doors/doorc-switch</property>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</release>
-		<hovered>
-			<binding>
-				<command>set-tooltip</command>
-				<tooltip-id>doorc-switch-lock</tooltip-id>
-				<label>Cockpit door switch</label>
-			</binding>
-		</hovered>
 	</animation>
 
 	<animation>
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index d3c089d6..fbe52f13 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -84,6 +84,7 @@ var triggerDoor = func(door, doorName, doorDesc) {
 };
 
 setlistener("/controls/doors/doorc-switch",func(a){
+	setprop("sim/sounde/switch1", 1);
 	if (systems.ELEC.Bus.dc1.getValue() > 25 or systems.ELEC.Bus.dc2.getValue() > 25) {
 		var pos = a.getValue();
 		var current = getprop("/sim/model/door-positions/doorc/lock-status");
@@ -95,11 +96,11 @@ setlistener("/controls/doors/doorc-switch",func(a){
 		else if (pos == -1 and current == 1) {		## UNLOCK
 			settimer( func {
 				if (a.getValue() == pos) setprop("/sim/model/door-positions/doorc/lock-status",0);
-			},0.2);
+			},0.3);
 		}
 		#setprop("/sim/model/door-positions/doorc/lock-status",-9); ## FAULT
 	}
-});
+},0,0);
 
 ###########
 # Systems #