diff --git a/audio/husky/aidl_config/audio_policy_volumes.xml b/audio/husky/aidl_config/audio_policy_volumes.xml
index a18d26a..8a138a0 100644
--- a/audio/husky/aidl_config/audio_policy_volumes.xml
+++ b/audio/husky/aidl_config/audio_policy_volumes.xml
@@ -51,8 +51,15 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-5200</point>
+        <point>13,-5000</point>
+        <point>28,-4400</point>
+        <point>56,-3380</point>
+        <point>71,-3120</point>
+        <point>85,-2750</point>
+        <point>100,-2150</point>
+    </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -62,9 +69,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
+        <point>1,-4935</point>
+        <point>14,-3320</point>
+        <point>28,-2960</point>
+        <point>71,-1400</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -76,31 +84,31 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6253</point>
-        <point>4,-6253</point>
-        <point>8,-5936</point>
-        <point>12,-5567</point>
-        <point>16,-5255</point>
-        <point>20,-4916</point>
-        <point>24,-4577</point>
-        <point>28,-4227</point>
-        <point>32,-4017</point>
-        <point>36,-3800</point>
-        <point>40,-3580</point>
-        <point>44,-3364</point>
-        <point>48,-3100</point>
-        <point>52,-2871</point>
-        <point>56,-2639</point>
-        <point>60,-2405</point>
-        <point>64,-2167</point>
-        <point>68,-1941</point>
-        <point>72,-1707</point>
-        <point>76,-1438</point>
-        <point>80,-1235</point>
-        <point>84,-1075</point>
-        <point>88,-931</point>
-        <point>92,-741</point>
-        <point>96,-524</point>
+        <point>1,-6920</point>
+        <point>4,-6920</point>
+        <point>8,-6664</point>
+        <point>12,-6374</point>
+        <point>16,-6082</point>
+        <point>20,-5759</point>
+        <point>24,-5410</point>
+        <point>28,-5038</point>
+        <point>32,-4807</point>
+        <point>36,-4577</point>
+        <point>40,-4339</point>
+        <point>44,-4132</point>
+        <point>48,-3860</point>
+        <point>52,-3569</point>
+        <point>56,-3223</point>
+        <point>60,-2823</point>
+        <point>64,-2452</point>
+        <point>68,-2078</point>
+        <point>72,-1795</point>
+        <point>76,-1561</point>
+        <point>80,-1226</point>
+        <point>84,-956</point>
+        <point>88,-789</point>
+        <point>92,-635</point>
+        <point>96,-505</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -112,10 +120,11 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
-        <point>100,0</point>
+        <point>0,-5600</point>
+        <point>14,-4670</point>
+        <point>28,-3060</point>
+        <point>71,-1050</point>
+        <point>100,-100</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@@ -126,10 +135,12 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
-        <point>100,0</point>
+        <point>1,-6350</point>
+        <point>14,-4300</point>
+        <point>28,-3710</point>
+        <point>66,-2100</point>
+        <point>85,-1550</point>
+        <point>100,-780</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -165,8 +176,15 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-5200</point>
+        <point>13,-5000</point>
+        <point>28,-4400</point>
+        <point>56,-3380</point>
+        <point>71,-3120</point>
+        <point>85,-2750</point>
+        <point>100,-2150</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -179,8 +197,14 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-6600</point>
+        <point>13,-6220</point>
+        <point>28,-5500</point>
+        <point>42,-4600</point>
+        <point>57,-4250</point>
+        <point>100,-2780</point>
+    </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
diff --git a/audio/husky/config/audio_policy_volumes.xml b/audio/husky/config/audio_policy_volumes.xml
index a18d26a..8a138a0 100644
--- a/audio/husky/config/audio_policy_volumes.xml
+++ b/audio/husky/config/audio_policy_volumes.xml
@@ -51,8 +51,15 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-5200</point>
+        <point>13,-5000</point>
+        <point>28,-4400</point>
+        <point>56,-3380</point>
+        <point>71,-3120</point>
+        <point>85,-2750</point>
+        <point>100,-2150</point>
+    </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -62,9 +69,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
+        <point>1,-4935</point>
+        <point>14,-3320</point>
+        <point>28,-2960</point>
+        <point>71,-1400</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -76,31 +84,31 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6253</point>
-        <point>4,-6253</point>
-        <point>8,-5936</point>
-        <point>12,-5567</point>
-        <point>16,-5255</point>
-        <point>20,-4916</point>
-        <point>24,-4577</point>
-        <point>28,-4227</point>
-        <point>32,-4017</point>
-        <point>36,-3800</point>
-        <point>40,-3580</point>
-        <point>44,-3364</point>
-        <point>48,-3100</point>
-        <point>52,-2871</point>
-        <point>56,-2639</point>
-        <point>60,-2405</point>
-        <point>64,-2167</point>
-        <point>68,-1941</point>
-        <point>72,-1707</point>
-        <point>76,-1438</point>
-        <point>80,-1235</point>
-        <point>84,-1075</point>
-        <point>88,-931</point>
-        <point>92,-741</point>
-        <point>96,-524</point>
+        <point>1,-6920</point>
+        <point>4,-6920</point>
+        <point>8,-6664</point>
+        <point>12,-6374</point>
+        <point>16,-6082</point>
+        <point>20,-5759</point>
+        <point>24,-5410</point>
+        <point>28,-5038</point>
+        <point>32,-4807</point>
+        <point>36,-4577</point>
+        <point>40,-4339</point>
+        <point>44,-4132</point>
+        <point>48,-3860</point>
+        <point>52,-3569</point>
+        <point>56,-3223</point>
+        <point>60,-2823</point>
+        <point>64,-2452</point>
+        <point>68,-2078</point>
+        <point>72,-1795</point>
+        <point>76,-1561</point>
+        <point>80,-1226</point>
+        <point>84,-956</point>
+        <point>88,-789</point>
+        <point>92,-635</point>
+        <point>96,-505</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -112,10 +120,11 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
-        <point>100,0</point>
+        <point>0,-5600</point>
+        <point>14,-4670</point>
+        <point>28,-3060</point>
+        <point>71,-1050</point>
+        <point>100,-100</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@@ -126,10 +135,12 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
-        <point>100,0</point>
+        <point>1,-6350</point>
+        <point>14,-4300</point>
+        <point>28,-3710</point>
+        <point>66,-2100</point>
+        <point>85,-1550</point>
+        <point>100,-780</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -165,8 +176,15 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-5200</point>
+        <point>13,-5000</point>
+        <point>28,-4400</point>
+        <point>56,-3380</point>
+        <point>71,-3120</point>
+        <point>85,-2750</point>
+        <point>100,-2150</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -179,8 +197,14 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-6600</point>
+        <point>13,-6220</point>
+        <point>28,-5500</point>
+        <point>42,-4600</point>
+        <point>57,-4250</point>
+        <point>100,-2780</point>
+    </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
diff --git a/audio/husky/tuning/waves/waves_preset.mps b/audio/husky/tuning/waves/waves_preset.mps
index 283bef8..b9e4b50 100644
Binary files a/audio/husky/tuning/waves/waves_preset.mps and b/audio/husky/tuning/waves/waves_preset.mps differ