diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index 41ee59a..4c6ab60 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -71,8 +71,8 @@
         <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="19" />
         <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="6" />
         <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="7" />
-        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="18" />
-        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="18" />
+        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="4" />
+        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="4" />
         <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
         <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
     </pcm_ids>
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 7f4fff7..4fc989a 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -96,6 +96,7 @@
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="0" />
     <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
     <ctl name="AUX_PCM_RX Audio Mixer MultiMedia1" value="0" />
+    <ctl name="AUX_PCM_RX Audio Mixer MultiMedia3" value="0" />
     <ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="AUX_PCM_RX Audio Mixer MultiMedia7" value="0" />
@@ -196,6 +197,7 @@
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
     <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
+    <ctl name="MultiMedia3 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
@@ -208,6 +210,7 @@
     <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
     <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="0" />
+    <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia7" value="0" />
@@ -795,7 +798,7 @@
     </path>
 
     <path name="audio-ull-playback display-port">
-        <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="1" />
+        <ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
     </path>
 
     <path name="audio-ull-playback speaker-and-display-port">
@@ -934,11 +937,11 @@
     </path>
 
     <path name="mmap-playback">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
+        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
     <path name="mmap-playback speaker">
-        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
     <path name="mmap-playback speaker-and-headphones">
@@ -947,7 +950,7 @@
     </path>
 
     <path name="mmap-playback bt-sco">
-        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia10" value="1" />
+        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
     <path name="mmap-playback bt-sco-wb">
@@ -956,7 +959,15 @@
     </path>
 
     <path name="mmap-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
+        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="1" />
+    </path>
+
+    <path name="mmap-playback usb-headset">
+        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="1" />
+    </path>
+
+    <path name="mmap-playback usb-headphones">
+        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
     <path name="mmap-playback speaker-and-bt-sco">
@@ -1010,11 +1021,11 @@
     </path>
 
     <path name="mmap-record">
-      <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
+      <ctl name="MultiMedia3 Mixer SLIM_0_TX" value="1" />
     </path>
 
     <path name="mmap-record bt-sco">
-      <ctl name="MultiMedia10 Mixer AUX_PCM_UL_TX" value="1" />
+      <ctl name="MultiMedia3 Mixer AUX_PCM_UL_TX" value="1" />
     </path>
 
     <path name="mmap-record bt-sco-wb">
@@ -1023,7 +1034,11 @@
     </path>
 
     <path name="mmap-record capture-fm">
-      <ctl name="MultiMedia10 Mixer TERT_MI2S_TX" value="1" />
+      <ctl name="MultiMedia3 Mixer TERT_MI2S_TX" value="1" />
+    </path>
+
+    <path name="mmap-record usb-headset-mic">
+       <ctl name="MultiMedia3 Mixer USB_AUDIO_TX" value="1" />
     </path>
 
     <path name="vowlan-call">
@@ -1911,7 +1926,7 @@
     </path>
 
     <path name="audio-ull-playback bt-a2dp">
-        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia3" value="1" />
+        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker-and-bt-a2dp">