diff --git a/audio/comet/aidl_config/audio_policy_volumes.xml b/audio/comet/aidl_config/audio_policy_volumes.xml
index 046a3a1..e5fcd20 100644
--- a/audio/comet/aidl_config/audio_policy_volumes.xml
+++ b/audio/comet/aidl_config/audio_policy_volumes.xml
@@ -52,7 +52,7 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4000</point>
+        <point>1,-3700</point>
         <point>71,-1800</point>
         <point>100,-1000</point>
     </volume>
@@ -78,10 +78,10 @@ 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,-5750</point>
-        <point>32,-3200</point>
-        <point>60,-1700</point>
-        <point>80,-1000</point>
+        <point>1,-6000</point>
+        <point>12,-4750</point>
+        <point>32,-3100</point>
+        <point>80,-900</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -93,8 +93,9 @@ 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,-3500</point>
-        <point>1,-3000</point>
+        <point>0,-4500</point>
+        <point>28,-2600</point>
+        <point>42,-1400</point>
         <point>71,-600</point>
         <point>100,0</point>
     </volume>
@@ -107,8 +108,8 @@ 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,-3300</point>
-        <point>57,-1700</point>
+        <point>1,-3650</point>
+        <point>57,-1600</point>
         <point>71,-1100</point>
         <point>100,0</point>
     </volume>
@@ -147,8 +148,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4960</point>
-        <point>100,0</point>
+        <point>1,-3700</point>
+        <point>71,-1800</point>
+        <point>100,-1000</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -163,9 +165,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4900</point>
+        <point>1,-5700</point>
         <point>57,-2200</point>
-        <point>100,-550</point>
+        <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/comet/tuning/waves/waves_preset.mps b/audio/comet/tuning/waves/waves_preset.mps
index 7019f65..397226d 100644
Binary files a/audio/comet/tuning/waves/waves_preset.mps and b/audio/comet/tuning/waves/waves_preset.mps differ