diff --git a/audio/acdbdata/Bluetooth_cal.acdb b/audio/acdbdata/Bluetooth_cal.acdb
index 22faade..e35cb48 100644
Binary files a/audio/acdbdata/Bluetooth_cal.acdb and b/audio/acdbdata/Bluetooth_cal.acdb differ
diff --git a/audio/acdbdata/General_cal.acdb b/audio/acdbdata/General_cal.acdb
index 5b7455b..639024f 100644
Binary files a/audio/acdbdata/General_cal.acdb and b/audio/acdbdata/General_cal.acdb differ
diff --git a/audio/acdbdata/Global_cal.acdb b/audio/acdbdata/Global_cal.acdb
index 904c040..c6080e6 100644
Binary files a/audio/acdbdata/Global_cal.acdb and b/audio/acdbdata/Global_cal.acdb differ
diff --git a/audio/acdbdata/Handset_cal.acdb b/audio/acdbdata/Handset_cal.acdb
index 9914ece..7c29de2 100644
Binary files a/audio/acdbdata/Handset_cal.acdb and b/audio/acdbdata/Handset_cal.acdb differ
diff --git a/audio/acdbdata/Hdmi_cal.acdb b/audio/acdbdata/Hdmi_cal.acdb
index f0cf359..48f9b99 100644
Binary files a/audio/acdbdata/Hdmi_cal.acdb and b/audio/acdbdata/Hdmi_cal.acdb differ
diff --git a/audio/acdbdata/Headset_cal.acdb b/audio/acdbdata/Headset_cal.acdb
index 43f735d..0bfbd36 100644
Binary files a/audio/acdbdata/Headset_cal.acdb and b/audio/acdbdata/Headset_cal.acdb differ
diff --git a/audio/acdbdata/Speaker_cal.acdb b/audio/acdbdata/Speaker_cal.acdb
index d663950..dcfc90e 100644
Binary files a/audio/acdbdata/Speaker_cal.acdb and b/audio/acdbdata/Speaker_cal.acdb differ
diff --git a/audio/acdbdata/workspaceFile.qwsp b/audio/acdbdata/workspaceFile.qwsp
index ba68fab..2c802f4 100644
Binary files a/audio/acdbdata/workspaceFile.qwsp and b/audio/acdbdata/workspaceFile.qwsp differ
diff --git a/audio/mixer_paths_bolero_snd.xml b/audio/mixer_paths_bolero_snd.xml
index b1a1c18..c8bc5a3 100644
--- a/audio/mixer_paths_bolero_snd.xml
+++ b/audio/mixer_paths_bolero_snd.xml
@@ -555,24 +555,34 @@
     </path>
 
     <path name="echo-reference handset">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_TDM_TX_0" />
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_TDM_RX_0" />
         <ctl name="EC Reference Channels" value="One"/>
     </path>
 
     <path name="echo-reference speaker">
-        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_TDM_TX_0"/>
-        <ctl name="EC Reference Channels" value="Two"/>
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUIN_TDM_TX_0" />
+        <ctl name="EC Reference Channels" value="One"/>
     </path>
 
     <path name="echo-reference headphones">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
-        <ctl name="EC Reference Channels" value="Two"/>
+        <ctl name="EC Reference Channels" value="One"/>
     </path>
 
     <path name="echo-reference headset">
         <path name="echo-reference headphones" />
     </path>
 
+     <path name="echo-reference usb-headset">
+         <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
+         <ctl name="EC Reference Channels" value="Two"/>
+     </path>
+
+     <path name="echo-reference usb-headphones">
+         <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
+         <ctl name="EC Reference Channels" value="Two"/>
+     </path>
+
     <path name="echo-reference display-port">
         <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
         <ctl name="EC Reference Channels" value="Two"/>
@@ -1905,6 +1915,7 @@
         <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
         <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
         <ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
+        <ctl name="RX_CDC_DMA_RX_0 Format" value="S24_3LE" />
         <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
         <ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
         <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
@@ -1940,7 +1951,8 @@
 
     <path name="headset-mic">
         <path name="amic2" />
-        <ctl name="TX_DEC0 Volume" value="84" />
+        <ctl name="ADC2 Volume" value="12" />
+        <ctl name="TX_DEC0 Volume" value="70" />
     </path>
 
     <path name="headset-mic-liquid">
@@ -1950,13 +1962,13 @@
     <path name="voice-handset">
         <path name="handset" />
         <ctl name="PCM Source" value="ASP" />
-        <ctl name="AMP PCM Gain" value="8" />
+        <ctl name="AMP PCM Gain" value="10" />
     </path>
 
     <path name="voice-handset-tmus">
         <path name="handset" />
         <ctl name="PCM Source" value="ASP" />
-        <ctl name="AMP PCM Gain" value="8" />
+        <ctl name="AMP PCM Gain" value="10" />
     </path>
 
     <path name="voice-hac-handset">
@@ -2007,6 +2019,8 @@
 
     <path name="voice-headphones">
         <path name="headphones" />
+        <ctl name="RX_RX0 Digital Volume" value="80" />
+        <ctl name="RX_RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-headset">
@@ -2018,9 +2032,7 @@
     </path>
 
     <path name="voice-headset-mic">
-        <path name="amic2" />
-        <ctl name="ADC2 Volume" value="12" />
-        <ctl name="TX_DEC0 Volume" value="84" />
+        <path name="headset-mic" />
     </path>
 
     <path name="speaker-and-headphones">
diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml
index 635f721..d6e2008 100644
--- a/audio_policy_volumes.xml
+++ b/audio_policy_volumes.xml
@@ -24,21 +24,17 @@ volume index from 0 to 100.
 
 <volumes>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
+        <point>0,-2700</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
+        <point>0,-2150</point>
+        <point>66,-950</point>
+        <point>83,-600</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
+        <point>0,-2700</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"