diff --git a/A320-main.xml b/A320-main.xml
index adde2bd4..3abab8ef 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -104,8 +104,11 @@
 		<sounde>
 			<seatbelt-sign type="bool">0</seatbelt-sign>
 			<no-smoking-sign type="bool">0</no-smoking-sign>
-			<oh-btn type="bool">0</oh-btn>
-			<oh-knb type="bool">0</oh-knb>
+			<btn1 type="bool">0</btn1>
+			<btn2 type="bool">0</btn2>
+			<btn3 type="bool">0</btn3>
+			<knb1 type="bool">0</knb1>
+			<switch1 type="bool">0</switch1>
 		</sounde>
 
 		<instrumentation>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 17cb24e1..a62adc02 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -606,7 +606,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -673,7 +673,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -740,7 +740,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1047,7 +1047,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1119,7 +1119,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1152,7 +1152,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1219,7 +1219,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1286,7 +1286,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1353,7 +1353,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1421,7 +1421,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1486,7 +1486,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1551,7 +1551,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1616,7 +1616,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1680,7 +1680,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation-->
@@ -1745,7 +1745,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1810,7 +1810,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1875,7 +1875,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1941,7 +1941,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -1996,7 +1996,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2051,7 +2051,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2171,7 +2171,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2247,7 +2247,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2322,7 +2322,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2393,7 +2393,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2431,7 +2431,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2536,7 +2536,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2726,7 +2726,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2803,7 +2803,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2878,7 +2878,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -2945,7 +2945,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3011,7 +3011,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3086,7 +3086,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3169,7 +3169,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3218,7 +3218,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3290,7 +3290,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3628,7 +3628,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
@@ -3707,7 +3707,7 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>setprop("/sim/sounde/btn1", 1);</script>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index c6864d92..294442c7 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -79,6 +79,24 @@ setlistener("/sim/sounde/btn1", func {
 	}, 0.05);
 });
 
+setlistener("/sim/sounde/oh-btn", func {
+	if (!getprop("/sim/sounde/oh-btn")) {
+		return;
+	}
+	settimer(func {
+		props.globals.getNode("/sim/sounde/oh-btn").setBoolValue(0);
+	}, 0.05);
+});
+
+setlistener("/sim/sounde/btn3", func {
+	if (!getprop("/sim/sounde/btn3")) {
+		return;
+	}
+	settimer(func {
+		props.globals.getNode("/sim/sounde/btn3").setBoolValue(0);
+	}, 0.05);
+});
+
 setlistener("/sim/sounde/knb1", func {
 	if (!getprop("/sim/sounde/knb1")) {
 		return;
@@ -108,7 +126,7 @@ setlistener("/controls/switches/no-smoking-sign", func {
 	props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(1);
 	settimer(func {
 		props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(0);
-	}, 2);
+	}, 1);
 });
 
 #########
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index 87ed708c..26cc3160 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -704,7 +704,7 @@
 	<switch>
 		<name>Button</name>
 		<mode>once</mode>
-		<path>Aircraft/A320Family/Sounds/Cockpit/button.wav</path>
+		<path>Aircraft/A330Family/Sounds/Cockpit/button.wav</path>
 		<condition>
 			<property>/sim/sounde/btn1</property>
 		</condition>
@@ -713,6 +713,30 @@
 		</volume>
 	</switch>
 	
+	<switch>
+		<name>ButtonOH</name>
+		<mode>once</mode>
+		<path>Aircraft/A330Family/Sounds/Cockpit/button2.wav</path>
+		<condition>
+			<property>/sim/sounde/oh-btn</property>
+		</condition>
+		<volume>
+			<factor>0.75</factor>
+		</volume>
+	</switch>
+	
+	<switch>
+		<name>Button3</name>
+		<mode>once</mode>
+		<path>Aircraft/A330Family/Sounds/Cockpit/button3.wav</path>
+		<condition>
+			<property>/sim/sounde/btn3</property>
+		</condition>
+		<volume>
+			<factor>0.75</factor>
+		</volume>
+	</switch>
+	
 	<switch>
 		<name>Knob</name>
 		<mode>once</mode>
@@ -733,7 +757,7 @@
 			<property>/sim/sounde/switch1</property>
 		</condition>
 		<volume>
-			<factor>0.60</factor>
+			<factor>0.75</factor>
 		</volume>
 	</switch>
 	
diff --git a/Sounds/Cockpit/button2.wav b/Sounds/Cockpit/button2.wav
new file mode 100644
index 00000000..fef8b5a9
Binary files /dev/null and b/Sounds/Cockpit/button2.wav differ
diff --git a/Sounds/Cockpit/button3.wav b/Sounds/Cockpit/button3.wav
new file mode 100644
index 00000000..511272cc
Binary files /dev/null and b/Sounds/Cockpit/button3.wav differ
diff --git a/Sounds/Cockpit/switch.wav b/Sounds/Cockpit/switch.wav
index 605e5006..b886d6f0 100644
Binary files a/Sounds/Cockpit/switch.wav and b/Sounds/Cockpit/switch.wav differ