diff --git a/Sounds/SASA/V2500/cockpit/v2500-buzz.wav b/Sounds/SASA/V2500/cockpit/v2500-buzz.wav
new file mode 100644
index 00000000..0af91e4a
Binary files /dev/null and b/Sounds/SASA/V2500/cockpit/v2500-buzz.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-comb.wav b/Sounds/SASA/V2500/cockpit/v2500-comb.wav
new file mode 100644
index 00000000..78302dd0
Binary files /dev/null and b/Sounds/SASA/V2500/cockpit/v2500-comb.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-idle.wav b/Sounds/SASA/V2500/cockpit/v2500-idle.wav
new file mode 100644
index 00000000..ddfe0c9f
Binary files /dev/null and b/Sounds/SASA/V2500/cockpit/v2500-idle.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav b/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav
new file mode 100644
index 00000000..2a7b20a0
Binary files /dev/null and b/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-reverse.wav b/Sounds/SASA/V2500/cockpit/v2500-reverse.wav
new file mode 100644
index 00000000..ca4b986a
Binary files /dev/null and b/Sounds/SASA/V2500/cockpit/v2500-reverse.wav differ
diff --git a/Sounds/v2500-sound.xml b/Sounds/v2500-sound.xml
index be66b8ad..1ec07a2a 100644
--- a/Sounds/v2500-sound.xml
+++ b/Sounds/v2500-sound.xml
@@ -6,7 +6,7 @@
 	<engine>
 		<name>a320_cockpit_idle_left</name>
 		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/CFM56/cockpit/v2500-idle.wav</path>
+		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-idle.wav</path>
 		<condition>
 			<property>/sim/sound/suppress-warning</property>
 		</condition>
@@ -47,50 +47,6 @@
 		</position>
 	</engine>
 	
-	<engine>
-		<name>a320_cockpit_idle2_left</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-idle2.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/idle2-left-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/idle2-left-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
-	<engine>
-		<name>a320_cockpit_idle2_right</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-idle2.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/idle2-right-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/idle2-right-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>-20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
 	<engine>
 		<name>a320_cockpit_lowspool_left</name>
 		<mode>looped</mode>
@@ -135,94 +91,6 @@
 		</position>
 	</engine>
 	
-	<engine>
-		<name>a320_cockpit_spool_left</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/spool-left-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/spool-left-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
-	<engine>
-		<name>a320_cockpit_spool_right</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/spool-right-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/spool-right-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>-20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
-	<engine>
-		<name>a320_cockpit_hum_left</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-hum.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/hum-left-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/hum-left-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
-	<engine>
-		<name>a320_cockpit_hum_right</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-hum.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/hum-right-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/hum-right-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>-20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
 	<engine>
 		<name>a320_cockpit_comb_left</name>
 		<mode>looped</mode>
@@ -267,50 +135,6 @@
 		</position>
 	</engine>
 	
-	<engine>
-		<name>a320_cockpit_comb2_left</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-comb-full.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/comb2-left-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/comb2-left-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
-	<engine>
-		<name>a320_cockpit_comb2_right</name>
-		<mode>looped</mode>
-		<path>Aircraft/IDG-A32X/Sounds/SASA/V2500/cockpit/v2500-comb-full.wav</path>
-		<condition>
-			<property>/sim/sound/suppress-warning</property>
-		</condition>
-		<volume>
-			<property>a320/sound/cockpit/comb2-right-v</property>
-			<offset>0</offset>
-		</volume>
-		<pitch>
-			<property>a320/sound/cockpit/comb2-right-p</property>
-			<offset>0</offset>
-		</pitch>
-		<position>
-			<x>00</x>
-			<y>-20</y>
-			<z>00</z>
-		</position>
-	</engine>
-	
 	<engine>
 		<name>a320_cockpit_buzz_left</name>
 		<mode>looped</mode>
diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml
index 63f0d30b..09bd80e2 100644
--- a/Systems/v2500-sound.xml
+++ b/Systems/v2500-sound.xml
@@ -17,12 +17,13 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.15</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.19</ind> <dep>0.900</dep></entry>
-					<entry><ind>0.417</ind><dep>0.673</dep></entry>
-					<entry><ind>0.55</ind> <dep>0.297</dep></entry>
-					<entry><ind>0.572</ind><dep>0.042</dep></entry>
-					<entry><ind>0.70</ind> <dep>0.000</dep></entry>
+                    <entry><ind>0.19</ind>     <dep>0.000</dep></entry>
+					<entry><ind>0.417</ind>    <dep>0.172</dep></entry>
+					<entry><ind>0.536424</ind> <dep>0.255</dep></entry>
+					<entry><ind>0.562914</ind> <dep>0.989</dep></entry>
+					<entry><ind>0.818985</ind> <dep>0.851</dep></entry>
+					<entry><ind>0.911700</ind> <dep>0.617</dep></entry>
+					<entry><ind>0.997792</ind> <dep>0.340</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -49,12 +50,13 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.15</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.19</ind> <dep>0.900</dep></entry>
-					<entry><ind>0.417</ind><dep>0.673</dep></entry>
-					<entry><ind>0.55</ind> <dep>0.297</dep></entry>
-					<entry><ind>0.572</ind><dep>0.042</dep></entry>
-					<entry><ind>0.70</ind> <dep>0.000</dep></entry>
+                    <entry><ind>0.19</ind>     <dep>0.000</dep></entry>
+					<entry><ind>0.417</ind>    <dep>0.172</dep></entry>
+					<entry><ind>0.536424</ind> <dep>0.255</dep></entry>
+					<entry><ind>0.562914</ind> <dep>0.989</dep></entry>
+					<entry><ind>0.818985</ind> <dep>0.851</dep></entry>
+					<entry><ind>0.911700</ind> <dep>0.617</dep></entry>
+					<entry><ind>0.997792</ind> <dep>0.340</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -81,8 +83,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-					<entry><ind>0.19</ind> <dep>1.10</dep></entry>
-					<entry><ind>0.425</ind><dep>1.65</dep></entry>
+					<entry><ind>0.58</ind>    <dep>1.00</dep></entry>
+					<entry><ind>0.993378</ind><dep>1.851064</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -109,8 +111,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-					<entry><ind>0.19</ind> <dep>1.10</dep></entry>
-					<entry><ind>0.425</ind><dep>1.65</dep></entry>
+					<entry><ind>0.58</ind>    <dep>1.00</dep></entry>
+					<entry><ind>0.993378</ind><dep>1.851064</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -126,371 +128,6 @@
     </output>
 </filter>
 
-<!-- idle2 -->
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.15</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.19</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.417</ind><dep>0.620</dep></entry>
-					<entry><ind>0.55</ind> <dep>0.964</dep></entry>
-					<entry><ind>0.572</ind><dep>1.000</dep></entry>
-					<entry><ind>0.83</ind> <dep>0.180</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/idle2-left-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.15</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.19</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.417</ind><dep>0.620</dep></entry>
-					<entry><ind>0.55</ind> <dep>0.964</dep></entry>
-					<entry><ind>0.572</ind><dep>1.000</dep></entry>
-					<entry><ind>0.83</ind> <dep>0.180</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/idle2-right-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-					<entry><ind>0.58</ind> <dep>1.00</dep></entry>
-					<entry><ind>0.82</ind> <dep>1.50</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/idle2-left-p</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-					<entry><ind>0.58</ind> <dep>1.00</dep></entry>
-					<entry><ind>0.82</ind> <dep>1.50</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/idle2-right-p</prop>
-    </output>
-</filter>
-
-<!-- spool -->
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.20</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.31</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.50</ind> <dep>0.07</dep></entry>
-					<entry><ind>0.69</ind> <dep>0.980</dep></entry>
-					<entry><ind>0.764</ind><dep>0.886</dep></entry>
-					<entry><ind>0.88</ind> <dep>0.172</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/spool-left-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.20</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.31</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.50</ind> <dep>0.07</dep></entry>
-					<entry><ind>0.69</ind> <dep>0.980</dep></entry>
-					<entry><ind>0.764</ind><dep>0.886</dep></entry>
-					<entry><ind>0.88</ind> <dep>0.172</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/spool-right-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.31</ind> <dep>0.63</dep></entry>
-					<entry><ind>0.95</ind> <dep>2.00</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/spool-left-p</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.31</ind> <dep>0.63</dep></entry>
-					<entry><ind>0.95</ind> <dep>2.00</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/spool-right-p</prop>
-    </output>
-</filter>
-
-<!-- hum -->
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.20</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.417</ind><dep>0.005</dep></entry>
-					<entry><ind>0.55</ind> <dep>0.02</dep></entry>
-					<entry><ind>0.572</ind><dep>0.09</dep></entry>
-					<entry><ind>0.65</ind> <dep>0.80</dep></entry>
-					<entry><ind>0.75</ind> <dep>0.00</dep></entry>
-					<entry><ind>1.00</ind> <dep>0.00</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/hum-left-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.20</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.417</ind><dep>0.005</dep></entry>
-					<entry><ind>0.55</ind> <dep>0.02</dep></entry>
-					<entry><ind>0.572</ind><dep>0.09</dep></entry>
-					<entry><ind>0.65</ind> <dep>0.80</dep></entry>
-					<entry><ind>0.75</ind> <dep>0.00</dep></entry>
-					<entry><ind>1.00</ind> <dep>0.00</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/hum-right-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.58</ind> <dep>1.00</dep></entry>
-					<entry><ind>0.82</ind> <dep>1.50</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/hum-left-p</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.58</ind> <dep>1.00</dep></entry>
-					<entry><ind>0.82</ind> <dep>1.50</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/hum-right-p</prop>
-    </output>
-</filter>
-
 <!-- lowspool -->
 <filter>
     <type>gain</type>
@@ -503,12 +140,14 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.20</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.31</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.50</ind> <dep>0.464</dep></entry>
-					<entry><ind>0.69</ind> <dep>0.240</dep></entry>
-					<entry><ind>0.764</ind><dep>0.205</dep></entry>
-					<entry><ind>0.88</ind> <dep>0.043</dep></entry>
+                    <entry><ind>0.101</ind> <dep>0.000</dep></entry>
+                    <entry><ind>0.214</ind> <dep>0.290</dep></entry>
+					<entry><ind>0.514</ind> <dep>0.531</dep></entry>
+					<entry><ind>0.695</ind> <dep>0.545</dep></entry>
+					<entry><ind>0.784</ind> <dep>0.414</dep></entry>
+					<entry><ind>0.859</ind> <dep>0.297</dep></entry>
+					<entry><ind>0.912</ind> <dep>0.255</dep></entry>
+					<entry><ind>0.960</ind> <dep>0.223</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -535,12 +174,14 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.20</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.31</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.50</ind> <dep>0.464</dep></entry>
-					<entry><ind>0.69</ind> <dep>0.240</dep></entry>
-					<entry><ind>0.764</ind><dep>0.205</dep></entry>
-					<entry><ind>0.88</ind> <dep>0.043</dep></entry>
+                    <entry><ind>0.101</ind> <dep>0.000</dep></entry>
+                    <entry><ind>0.214</ind> <dep>0.290</dep></entry>
+					<entry><ind>0.514</ind> <dep>0.531</dep></entry>
+					<entry><ind>0.695</ind> <dep>0.545</dep></entry>
+					<entry><ind>0.784</ind> <dep>0.414</dep></entry>
+					<entry><ind>0.859</ind> <dep>0.297</dep></entry>
+					<entry><ind>0.912</ind> <dep>0.255</dep></entry>
+					<entry><ind>0.960</ind> <dep>0.223</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -567,8 +208,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.31</ind> <dep>0.63</dep></entry>
-					<entry><ind>0.95</ind> <dep>2.00</dep></entry>
+                    <entry><ind>0.21</ind> <dep>0.319</dep></entry>
+					<entry><ind>1.00</ind> <dep>1.404</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -595,8 +236,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.31</ind> <dep>0.63</dep></entry>
-					<entry><ind>0.95</ind> <dep>2.00</dep></entry>
+                    <entry><ind>0.21</ind> <dep>0.319</dep></entry>
+					<entry><ind>1.00</ind> <dep>1.404</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -625,13 +266,13 @@
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
                     <entry><ind>0.59</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.62</ind> <dep>0.40</dep></entry>
-					<entry><ind>0.74</ind> <dep>0.128</dep></entry>
-					<entry><ind>0.78</ind> <dep>0.056</dep></entry>
-					<entry><ind>0.84</ind> <dep>0.056</dep></entry>
-					<entry><ind>0.944</ind><dep>0.04</dep></entry>
-					<entry><ind>0.998</ind><dep>0.04</dep></entry>
-					<entry><ind>1.0</ind>  <dep>0.04</dep></entry>
+					<entry><ind>0.62</ind> <dep>0.050</dep></entry>
+					<entry><ind>0.74</ind> <dep>0.350</dep></entry>
+					<entry><ind>0.78</ind> <dep>0.550</dep></entry>
+					<entry><ind>0.84</ind> <dep>0.980</dep></entry>
+					<entry><ind>0.944</ind><dep>0.950</dep></entry>
+					<entry><ind>0.998</ind><dep>0.950</dep></entry>
+					<entry><ind>1.0</ind>  <dep>0.950</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -659,13 +300,13 @@
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
                     <entry><ind>0.59</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.62</ind> <dep>0.40</dep></entry>
-					<entry><ind>0.74</ind> <dep>0.128</dep></entry>
-					<entry><ind>0.78</ind> <dep>0.056</dep></entry>
-					<entry><ind>0.84</ind> <dep>0.056</dep></entry>
-					<entry><ind>0.944</ind><dep>0.04</dep></entry>
-					<entry><ind>0.998</ind><dep>0.04</dep></entry>
-					<entry><ind>1.0</ind>  <dep>0.04</dep></entry>
+					<entry><ind>0.62</ind> <dep>0.050</dep></entry>
+					<entry><ind>0.74</ind> <dep>0.350</dep></entry>
+					<entry><ind>0.78</ind> <dep>0.550</dep></entry>
+					<entry><ind>0.84</ind> <dep>0.980</dep></entry>
+					<entry><ind>0.944</ind><dep>0.950</dep></entry>
+					<entry><ind>0.998</ind><dep>0.950</dep></entry>
+					<entry><ind>1.0</ind>  <dep>0.950</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -692,8 +333,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.60</ind> <dep>1.00</dep></entry>
-					<entry><ind>1.00</ind> <dep>2.00</dep></entry>
+                    <entry><ind>0.60</ind> <dep>0.50</dep></entry>
+					<entry><ind>1.00</ind> <dep>1.00</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -720,8 +361,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.60</ind> <dep>1.00</dep></entry>
-					<entry><ind>1.00</ind> <dep>2.00</dep></entry>
+                    <entry><ind>0.60</ind> <dep>0.50</dep></entry>
+					<entry><ind>1.00</ind> <dep>1.00</dep></entry>
                 </table>
             </product>
         </expression> 
@@ -737,131 +378,6 @@
     </output>
 </filter>
 
-<!-- comb2 -->
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.59</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.62</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.74</ind> <dep>0.013</dep></entry>
-					<entry><ind>0.78</ind> <dep>0.4025</dep></entry>
-					<entry><ind>0.84</ind> <dep>0.950</dep></entry>
-					<entry><ind>0.944</ind><dep>0.900</dep></entry>
-					<entry><ind>0.998</ind><dep>0.900</dep></entry>
-					<entry><ind>1.0</ind>  <dep>0.900</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/comb2-left-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.59</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.62</ind> <dep>0.00</dep></entry>
-					<entry><ind>0.74</ind> <dep>0.013</dep></entry>
-					<entry><ind>0.78</ind> <dep>0.4025</dep></entry>
-					<entry><ind>0.84</ind> <dep>0.950</dep></entry>
-					<entry><ind>0.944</ind><dep>0.900</dep></entry>
-					<entry><ind>0.998</ind><dep>0.900</dep></entry>
-					<entry><ind>1.0</ind>  <dep>0.900</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/comb2-right-v</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.60</ind> <dep>0.50</dep></entry>
-					<entry><ind>1.00</ind> <dep>1.00</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/comb2-left-p</prop>
-    </output>
-</filter>
-
-<filter>
-    <type>gain</type>
-    <gain>1</gain>
-    <input>
-		<condition>
-			<property>sim/current-view/internal</property>
-		</condition>
-        <expression>
-            <product>
-                <table>
-                    <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.60</ind> <dep>0.50</dep></entry>
-					<entry><ind>1.00</ind> <dep>1.00</dep></entry>
-                </table>
-            </product>
-        </expression> 
-    </input>
-	<input>
-		<condition>
-			<not><property>sim/current-view/internal</property></not>
-		</condition>
-		<expression><value>0</value></expression>
-	</input>
-    <output>
-        <prop>a320/sound/cockpit/comb2-right-p</prop>
-    </output>
-</filter>
-
 <!-- buzz -->
 <filter>
     <type>gain</type>
@@ -874,8 +390,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.75</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.80</ind> <dep>0.894</dep></entry>
+                    <entry><ind>0.70</ind> <dep>0.000</dep></entry>
+					<entry><ind>0.74</ind> <dep>0.894</dep></entry>
 					<entry><ind>0.87</ind> <dep>0.995</dep></entry>
 					<entry><ind>0.89</ind> <dep>1.000</dep></entry>
 					<entry><ind>0.95</ind> <dep>0.936</dep></entry>
@@ -906,8 +422,8 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.75</ind> <dep>0.000</dep></entry>
-					<entry><ind>0.80</ind> <dep>0.894</dep></entry>
+                    <entry><ind>0.70</ind> <dep>0.000</dep></entry>
+					<entry><ind>0.74</ind> <dep>0.894</dep></entry>
 					<entry><ind>0.87</ind> <dep>0.995</dep></entry>
 					<entry><ind>0.89</ind> <dep>1.000</dep></entry>
 					<entry><ind>0.95</ind> <dep>0.936</dep></entry>
@@ -938,7 +454,7 @@
             <product>
                 <table>
                     <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.31</ind> <dep>0.315</dep></entry>
+                    <entry><ind>0.20</ind> <dep>0.245</dep></entry>
 					<entry><ind>0.95</ind> <dep>1.000</dep></entry>
                 </table>
             </product>
@@ -966,7 +482,7 @@
             <product>
                 <table>
                     <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product>
-                    <entry><ind>0.31</ind> <dep>0.315</dep></entry>
+                    <entry><ind>0.20</ind> <dep>0.245</dep></entry>
 					<entry><ind>0.95</ind> <dep>1.000</dep></entry>
                 </table>
             </product>