diff --git a/A320-main.xml b/A320-main.xml
index cd98de39..36150e2e 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1089,7 +1089,7 @@
 				<bleed-1 type="bool">1</bleed-1>
 				<bleed-2 type="bool">1</bleed-2>
 				<blower type="bool">0</blower>
-				<cabin-fans type="bool">0</cabin-fans>
+				<cabin-fans type="bool">1</cabin-fans>
 				<extract type="bool">0</extract>
 				<groundair type="bool">0</groundair>
 				<hot-air type="bool">1</hot-air>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 64a9053e..4742c096 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -5606,7 +5606,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>property-toggle</command>
-				<property>controls/switches/pneumatics/cabin-fans</property>
+				<property>controls/pneumatics/switches/cabin-fans</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -5621,7 +5621,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>controls/switches/pneumatics/cabin-fans</property>
+					<property>controls/pneumatics/switches/cabin-fans</property>
 					<value>0</value>
 				</equals>
 				<equals>
diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas
index 423bc9cf..cf87e525 100644
--- a/Nasal/Libraries/buttons.nas
+++ b/Nasal/Libraries/buttons.nas
@@ -31,7 +31,6 @@ var variousReset = func() {
 	setprop("/controls/CVR/tone", 0);
 	setprop("/controls/CVR/gndctl", 0);
 	setprop("/controls/CVR/erase", 0);
-	setprop("/controls/switches/pneumatics/cabin-fans", 1);
 	setprop("/controls/switches/emerCallLtO", 0); # ON light, flashes white for 10s
 	setprop("/controls/switches/emerCallLtC", 0); # CALL light, flashes amber for 10s
 	setprop("/controls/switches/emerCall", 0);
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index 10da1546..c35d0d53 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -30,7 +30,7 @@
 			</condition>
 			<volume>
 				<property>/engines/engine[2]/n1</property>
-				<factor>0.005</factor>
+				<factor>0.004</factor>
 			</volume>
 			<pitch>
 				<property>/engines/engine[2]/n1</property>
@@ -42,7 +42,7 @@
 		<hyd-yellow>
 			<name>yellowHydPump</name>
 			<mode>looped</mode>
-			<path>Aircraft/A320-family/Sounds/yellowHydPump.wav</path>
+			<path>Aircraft/A320-family/Sounds/Hydraulic/yellowHydPump.wav</path>
 			<condition>
 				<property>/systems/hydraulic/sources/yellow-elec/pump-operate</property>
 			</condition>
@@ -55,7 +55,7 @@
 		<hyd>
 			<name>PTU</name>
 			<mode>once</mode>
-			<path>airbus_ptu_on.wav</path>
+			<path>Aircraft/A320-family/Sounds/Hydraulic/airbus_ptu_on.wav</path>
 			<condition>
 				<or>
 					<property>/systems/hydraulic/sources/ptu/yellow-green</property>
@@ -73,7 +73,7 @@
 		<hyd>
 			<name>PTU-loop</name>
 			<mode>looped</mode>
-			<path>airbus_ptu.wav</path>
+			<path>Aircraft/A320-family/Sounds/Hydraulic/airbus_ptu.wav</path>
 			<condition>
 				<equals>
 					<property>/systems/hydraulic/sources/ptu/ptu-loop-sound</property>
@@ -127,7 +127,7 @@
 		<announcement>
 			<name>EmerCall</name>
 			<mode>once</mode>
-			<path>Aircraft/A320-family/Sounds/tripleBelt.wav</path>
+			<path>Aircraft/A320-family/Sounds/Cockpit/tripleBelt.wav</path>
 			<condition>
 				<equals>
 					<property>/controls/switches/emerCall</property>
@@ -146,7 +146,7 @@
 			<name>V1</name>
 			<mode>once</mode>
             <type>avionics</type>
-			<path>Aircraft/A320-family/Sounds/V1.wav</path>
+			<path>Aircraft/A320-family/Sounds/Cockpit/V1.wav</path>
 			<condition>
 				<and>
 					<equals>
@@ -1497,7 +1497,7 @@
 		<sb>
 			<mode>once</mode>
 			<name>sb</name>
-			<path>cabin-chime.wav</path>
+			<path>Aircraft/A320-family/Sounds/Cockpit/cabin-chime.wav</path>
 			<condition>
 				<and>
 					<greater-than>
@@ -1515,7 +1515,7 @@
 		<ns>
 			<mode>once</mode>
 			<name>ns</name>
-			<path>cabin-chime.wav</path>
+			<path>Aircraft/A320-family/Sounds/Cockpit/cabin-chime.wav</path>
 			<condition>
 				<and>
 					<greater-than>
@@ -1659,6 +1659,7 @@
 			<property>/surface-positions/flap-pos-norm</property>
 			<volume>
 				<property>sim/sound/wingview</property>
+				<factor>2</factor>
 			</volume>
 		</switch>
 		
@@ -1801,7 +1802,7 @@
 		<relay>
 			<name>Avionics</name>
 			<mode>looped</mode>
-			<path>Aircraft/A320-family/Sounds/320efis.wav</path>
+			<path>Aircraft/A320-family/Sounds/Cockpit/320efis.wav</path>
 			<condition>
 				<and>
 					<property>/sim/current-view/internal</property>
@@ -1818,7 +1819,7 @@
 				</and>
 			</condition>
 			<volume>
-				<factor>0.6</factor>
+				<factor>0.5</factor>
 			</volume>
 		</relay>
 		
diff --git a/Sounds/320efis.wav b/Sounds/Cockpit/320efis.wav
similarity index 100%
rename from Sounds/320efis.wav
rename to Sounds/Cockpit/320efis.wav
diff --git a/Sounds/V1.wav b/Sounds/Cockpit/V1.wav
similarity index 100%
rename from Sounds/V1.wav
rename to Sounds/Cockpit/V1.wav
diff --git a/Sounds/cabin-chime.wav b/Sounds/Cockpit/cabin-chime.wav
similarity index 100%
rename from Sounds/cabin-chime.wav
rename to Sounds/Cockpit/cabin-chime.wav
diff --git a/Sounds/tripleBelt.wav b/Sounds/Cockpit/tripleBelt.wav
similarity index 100%
rename from Sounds/tripleBelt.wav
rename to Sounds/Cockpit/tripleBelt.wav
diff --git a/Sounds/airbus_ptu.wav b/Sounds/Hydraulic/airbus_ptu.wav
similarity index 100%
rename from Sounds/airbus_ptu.wav
rename to Sounds/Hydraulic/airbus_ptu.wav
diff --git a/Sounds/airbus_ptu_on.wav b/Sounds/Hydraulic/airbus_ptu_on.wav
similarity index 100%
rename from Sounds/airbus_ptu_on.wav
rename to Sounds/Hydraulic/airbus_ptu_on.wav
diff --git a/Sounds/yellowHydPump.wav b/Sounds/Hydraulic/yellowHydPump.wav
similarity index 100%
rename from Sounds/yellowHydPump.wav
rename to Sounds/Hydraulic/yellowHydPump.wav
diff --git a/Sounds/cfm56-sound.xml b/Sounds/cfm56-sound.xml
index e49487ee..1a659756 100644
--- a/Sounds/cfm56-sound.xml
+++ b/Sounds/cfm56-sound.xml
@@ -4,7 +4,7 @@
   <fx>
 	<!-- cockpit -->
 	<engine>
-		<name>a320_startup_left</name>
+		<name>a320_starter_left</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
 		<condition>
@@ -25,7 +25,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_right</name>
+		<name>a320_starter_right</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
 		<condition>
@@ -46,7 +46,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_left_2</name>
+		<name>a320_startup_left</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
 		<condition>
@@ -67,7 +67,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_right_2</name>
+		<name>a320_startup_right</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
 		<condition>
@@ -129,6 +129,7 @@
 		</position>
 	</engine>
 	
+	
 	<engine>
 		<name>a320_cockpit_idle_1</name>
 		<mode>looped</mode>
@@ -613,7 +614,7 @@
 			<z>0</z>
 			<inner-angle>225</inner-angle>
 			<outer-angle>135</outer-angle>
-			<outer-gain>0.01</outer-gain>
+			<outer-gain>0.60</outer-gain>
 		</orientation>
 		<reference-dist>30</reference-dist>
 		<position>
@@ -643,7 +644,7 @@
 			<z>0</z>
 			<inner-angle>225</inner-angle>
 			<outer-angle>135</outer-angle>
-			<outer-gain>0.01</outer-gain>
+			<outer-gain>0.60</outer-gain>
 		</orientation>
 		<reference-dist>30</reference-dist>
 		<position>
@@ -673,7 +674,7 @@
 			<z>0</z>
 			<inner-angle>45</inner-angle>
 			<outer-angle>315</outer-angle>
-			<outer-gain>0.01</outer-gain>
+			<outer-gain>0.60</outer-gain>
 		</orientation>
 		<reference-dist>60</reference-dist>
 		<position>
@@ -703,7 +704,7 @@
 			<z>0</z>
 			<inner-angle>45</inner-angle>
 			<outer-angle>315</outer-angle>
-			<outer-gain>0.01</outer-gain>
+			<outer-gain>0.60</outer-gain>
 		</orientation>
 		<reference-dist>60</reference-dist>
 		<position>
diff --git a/Sounds/leapx-sound.xml b/Sounds/leapx-sound.xml
index 8156494f..9f12e6eb 100644
--- a/Sounds/leapx-sound.xml
+++ b/Sounds/leapx-sound.xml
@@ -4,7 +4,7 @@
   <fx>
 	<!-- cockpit -->
 	<engine>
-		<name>a320_startup_left</name>
+		<name>a320_starter_left</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
 		<condition>
@@ -25,7 +25,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_right</name>
+		<name>a320_starter_right</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_starter.wav</path>
 		<condition>
@@ -46,7 +46,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_left_2</name>
+		<name>a320_startup_left</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
 		<condition>
@@ -67,7 +67,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_right_2</name>
+		<name>a320_startup_right</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/CFM56B/start/A320_cockpit_startup.wav</path>
 		<condition>
diff --git a/Sounds/v2500-sound.xml b/Sounds/v2500-sound.xml
index 9654322c..a98c7ac2 100644
--- a/Sounds/v2500-sound.xml
+++ b/Sounds/v2500-sound.xml
@@ -4,7 +4,7 @@
   <fx>
 	<!-- cockpit -->
 	<engine>
-		<name>a320_startup_left</name>
+		<name>a320_starter_left</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start1.wav</path>
 		<condition>
@@ -25,7 +25,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_right</name>
+		<name>a320_starter_right</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start1.wav</path>
 		<condition>
@@ -46,7 +46,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_left_2</name>
+		<name>a320_startup_left</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start2.wav</path>
 		<condition>
@@ -67,7 +67,7 @@
 	</engine>
 	
 	<engine>
-		<name>a320_startup_right_2</name>
+		<name>a320_startup_right</name>
 		<mode>once</mode>
 		<path>Aircraft/A320-family/Sounds/SASA/V2500/start/v2500-start2.wav</path>
 		<condition>
diff --git a/Systems/a320-aircond.xml b/Systems/a320-aircond.xml
index 4c481df9..4d95eedd 100644
--- a/Systems/a320-aircond.xml
+++ b/Systems/a320-aircond.xml
@@ -769,7 +769,7 @@
 		<switch name="/systems/air-conditioning/recirc/cabin-fans">
 			<default value="0"/>
 			<test logic="AND" value="1">
-				/controls/switches/pneumatics/cabin-fans eq 1
+				/controls/pneumatics/switches/cabin-fans eq 1
 				/systems/failures/pneumatics/cabin-fans eq 0
 			</test>
 		</switch>
diff --git a/Systems/sound-common.xml b/Systems/sound-common.xml
index 81475c1e..fde3b611 100644
--- a/Systems/sound-common.xml
+++ b/Systems/sound-common.xml
@@ -95,12 +95,12 @@
 				<product>
 					<property>/sim/current-view/internal</property>
 					<table>
-						<product><property>/velocities/groundspeed-kt</property><value>1</value>  </product>
+						<product><property>/velocities/airspeed-kt</property><value>1</value>  </product>
 						<entry><ind>  0</ind><dep>0.0001</dep></entry>
 						<entry><ind> 10</ind><dep>0.0010</dep></entry>
 						<entry><ind>100</ind><dep>0.0100</dep></entry>
-						<entry><ind>250</ind><dep>0.1000</dep></entry>
-						<entry><ind>550</ind><dep>0.3000</dep></entry>
+						<entry><ind>200</ind><dep>0.1000</dep></entry>
+						<entry><ind>250</ind><dep>0.5000</dep></entry>
 					</table>
 				</product>
 			</expression> 
@@ -120,12 +120,12 @@
 			</condition>
 			<expression>
 				<table>
-					<property>/velocities/groundspeed-kt</property>
+					<property>/velocities/airspeed-kt</property>
 					<entry><ind>  0</ind><dep>0.0001</dep></entry>
 					<entry><ind> 10</ind><dep>0.0010</dep></entry>
 					<entry><ind>100</ind><dep>0.0100</dep></entry>
-					<entry><ind>250</ind><dep>0.1000</dep></entry>
-					<entry><ind>550</ind><dep>0.3000</dep></entry>
+					<entry><ind>200</ind><dep>0.1000</dep></entry>
+					<entry><ind>250</ind><dep>0.5000</dep></entry>
 				</table>
 			</expression> 
 		</input>
@@ -141,9 +141,9 @@
 				<product>
 					<property>/sim/sound/internal-custom</property>
 					<table>
-						<property>/velocities/groundspeed-kt</property>
+						<property>/velocities/airspeed-kt</property>
 						<entry><ind>  0</ind><dep>0.5</dep></entry>
-						<entry><ind>550</ind><dep>1.0</dep></entry>
+						<entry><ind>250</ind><dep>1.0</dep></entry>
 					</table>
 				</product>
 			</expression>