diff --git a/Android.bp b/Android.bp
index e51c7ec..f9a2c39 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,6 +87,75 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "audio.primary.s5e8825",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/audio.primary.s5e8825.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libprocessgroup",
+                "libexpat",
+                "libaudioproxy2",
+                "libaudio-ril",
+                "libsecaudioinfo",
+                "libSamsungPostProcessConvertor",
+                "librecordalive",
+                "libsecaudiolevel",
+                "libaboxpcmdump",
+                "liblastaboxmsg",
+                "libaudioroute.s5e8825",
+                "libtinyalsa.s5e8825",
+                "libaudioparamupdate",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "audio.sec_primary.default",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/audio.sec_primary.default.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libhardware",
+                "libspeakercalibration",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "gatekeeper.s5e8825",
     owner: "samsung",
@@ -301,54 +370,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "lib_SoundAlive_3DPosition_ver202",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so",
-            ],
-            shared_libs: [
-                "libc",
-                "libm",
-                "libdl",
-                "liblog",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "lib_SoundAlive_AlbumArt_ver105",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so",
-            ],
-            shared_libs: [
-                "libc",
-                "libm",
-                "libdl",
-                "liblog",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "lib_SoundAlive_SRC384_ver320",
     owner: "samsung",
@@ -402,6 +423,203 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libaboxpcmdump",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libaboxpcmdump.so",
+            ],
+            shared_libs: [
+                "libtinyalsa.s5e8825",
+                "libaudioroute.s5e8825",
+                "liblog",
+                "libcutils",
+                "libtinyalsa",
+                "libutils",
+                "libdatamod",
+                "libhardware_legacy",
+                "libexpat",
+                "libaudioroute",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libalsautils_sec",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libalsautils_sec.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libaudioutils",
+                "libtinyalsa",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libaudio-ril",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libaudio-ril.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libsecril-client",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libaudioparamupdate",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libaudioparamupdate.so",
+            ],
+            shared_libs: [
+                "libtinyalsa.s5e8825",
+                "libaudioroute.s5e8825",
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libtinyalsa",
+                "libaudioroute",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libaudioproxy2",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libaudioproxy2.so",
+            ],
+            shared_libs: [
+                "libtinyalsa.s5e8825",
+                "libaudioroute.s5e8825",
+                "liblog",
+                "libcutils",
+                "libprocessgroup",
+                "libexpat",
+                "libtinycompress",
+                "libaudioutils",
+                "libtinyalsa",
+                "libaudioroute",
+                "libalsautils_sec",
+                "libsehbluetooth_audio_session_aidl",
+                "vendor.samsung.hardware.bluetooth.audio-V1-ndk",
+                "libbinder_ndk",
+                "libfmq",
+                "libsecaudioinfo",
+                "libSamsungPostProcessConvertor",
+                "librecordalive",
+                "libsecaudiolevel",
+                "libaboxpcmdump",
+                "liblastaboxmsg",
+                "libaudioparamupdate",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libaudioroute.s5e8825",
+    stem: "libaudioroute.s5e8825",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libaudioroute.s5e8825.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libexpat",
+                "libtinyalsa",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libc++_shared",
     owner: "samsung",
@@ -447,6 +665,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libdatamod",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libdatamod.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libdpuhdr10p_8825",
     owner: "samsung",
@@ -712,6 +957,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "liblastaboxmsg",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/liblastaboxmsg.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "liboemcrypto",
     owner: "samsung",
@@ -967,6 +1239,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsecaudiolevel",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsecaudiolevel.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libsecaudioinfo",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsecnativefeature",
     owner: "samsung",
@@ -1021,6 +1321,36 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsehbluetooth_audio_session_aidl",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so",
+            ],
+            shared_libs: [
+                "libbase",
+                "libcutils",
+                "libbinder_ndk",
+                "libfmq",
+                "liblog",
+                "vendor.samsung.hardware.bluetooth.audio-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsemnativecarrierfeature",
     owner: "samsung",
@@ -1189,6 +1519,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libspeakercalibration",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libspeakercalibration.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libc",
+                "libmedia_helper",
+                "libc++",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libswcnr",
     owner: "samsung",
@@ -1263,6 +1621,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libtinyalsa.s5e8825",
+    stem: "libtinyalsa.s5e8825",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libtinyalsa.s5e8825.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libuniapi",
     owner: "samsung",
@@ -1531,66 +1914,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libaudioeffectoffload",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libtinyalsa",
-                "libsecaudioinfo",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "soundfx",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libmyspace",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/soundfx/libmyspace.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "libcutils",
-                "lib_SoundAlive_3DPosition_ver202",
-                "liblog",
-                "libaudioutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "soundfx",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libswdap",
     owner: "samsung",
@@ -1623,6 +1946,59 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.audio-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.bluetooth.audio-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "android.hardware.common-V2-ndk",
+                "android.hardware.common.fmq-V1-ndk",
+                "android.hardware.audio.common-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.samsung.hardware.gnss@2.0",
     owner: "samsung",
diff --git a/proprietary/vendor/etc/SoundBoosterParam.txt b/proprietary/vendor/etc/SoundBoosterParam.txt
new file mode 100644
index 0000000..edeea63
--- /dev/null
+++ b/proprietary/vendor/etc/SoundBoosterParam.txt
@@ -0,0 +1,193 @@
+S,1,2,0,1,1,1,1,1,2,1,3,0,1,-1,-1,1,-29,0,200,400,500,1000,0,0,1,3,4,5,0,200,400,500,1000,0,0,0,1,3,5,0,200,400,500,1000,0,0,1,3,4,5,0,200,400,500,1000,0,0,1,3,4,5,0,200,400,500,1000,3,3,4,4,4,5,0,200,400,500,1000,1,2,2,3,3,5,-1,0,5000,0,-1,5000,5000,0,-1
+AF,1,20,15,1,0,8,11,19,13,-16,-14,-13,-21,-10,-14,-14,-18,20,20,20,20,20,20,20,20,120,120,120,120,120,120,120,120,0,0,0,1,4,-6,10,150,0
+AFH,1,150,0
+AFA,1,1,220,250,5,1,704,200,-9,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-1
+AL,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+ALH,1,150,0
+ALA,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+AHA,1,100,0
+AHB,1,100,0
+AHC,1,120,0
+AHD,1,140,0
+AHE,1,150,0
+
+AMA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AMB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AMC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AMD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AME,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+
+APA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+APB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+APC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-4,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+APD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-5,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+APE,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-10,-11,-14,-21,-21,-12,-9,-9,-8,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+
+AVA,0,1,3,9,10,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AVB,1,1,3,8,8,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AVC,2,1,2,7,7,2,4,6,7,4,6,5,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AVD,3,1,1,6,6,2,4,6,7,4,5,4,2,2,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+AVE,4,1,0,6,5,2,4,6,7,4,4,3,1,1,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+
+AAA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+AAB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+AAC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
+AAD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
+AAE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+
+ABA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+ABB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+ABC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
+ABD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
+ABE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+
+ACA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+ACB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+ACC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
+ACD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
+ACE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+
+BF,1,20,15,1,0,8,11,19,13,-16,-14,-13,-21,-10,-14,-14,-18,20,20,20,20,20,20,20,20,120,120,120,120,120,120,120,120,0,0,0,1,4,-6,10,150,0
+BFH,1,150,0
+BFA,1,1,220,250,5,1,704,200,-9,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-1
+BL,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BLH,1,150,0
+BLA,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+BHA,1,100,0
+BHB,1,100,0
+BHC,1,120,0
+BHD,1,140,0
+BHE,1,150,0
+
+BMA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BMB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BMC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BMD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BME,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+
+BPA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BPB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BPC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-4,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BPD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-5,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BPE,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-10,-11,-14,-21,-21,-12,-9,-9,-8,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+
+BVA,0,1,3,9,10,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BVB,1,1,3,8,8,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BVC,2,1,2,7,7,2,4,6,7,4,6,5,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BVD,3,1,1,6,6,2,4,6,7,4,5,4,2,2,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+BVE,4,1,0,6,5,2,4,6,7,4,4,3,1,1,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
+
+BAA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+BAB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+BAC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
+BAD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
+BAE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+
+BBA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+BBB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+BBC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
+BBD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
+BBE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+
+BCA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+BCB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
+BCC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
+BCD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
+BCE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
+
+CF,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CFH,1,50,0
+CFA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
+CL,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CLH,1,50,0
+CLA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
+CHA,1,50,0
+CHB,1,50,0
+CHC,1,50,0
+CHD,1,50,0
+CHE,1,50,0
+
+CMA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CMB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CMC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CMD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CME,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+
+CPA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CPB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CPC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CPD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CPE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+
+CVA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CVB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CVC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CVD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+CVE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+
+CAA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CAB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CAC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CAD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CAE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+
+CBA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CBB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CBC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CBD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CBE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+
+CCA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CCB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CCC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CCD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+CCE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+
+DF,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DFH,1,50,0
+DFA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
+DL,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DLH,1,50,0
+DLA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
+DHA,1,50,0
+DHB,1,50,0
+DHC,1,50,0
+DHD,1,50,0
+DHE,1,50,0
+
+DMA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DMB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DMC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DMD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DME,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+
+DPA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DPB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DPC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DPD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DPE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+
+DVA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DVB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DVC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DVD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+DVE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
+
+DAA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DAB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DAC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DAD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DAE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+
+DBA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DBB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DBC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DBD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DBE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+
+DCA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DCB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DCC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DCD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+DCE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
+
diff --git a/proprietary/vendor/etc/audio_board_info.xml b/proprietary/vendor/etc/audio_board_info.xml
deleted file mode 100644
index f964b90..0000000
--- a/proprietary/vendor/etc/audio_board_info.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Built-In Microphone Characteristic.
-     It should be modified based on real target board's conf -->
-<audio_board_info>
-    <microphone_characteristics>
-        <microphone device_id="builtin_mic1"
-                    id="0"
-                    device="AUDIO_DEVICE_IN_BUILTIN_MIC"
-                    address="bottom"
-                    location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
-                    group="0"
-                    index_in_the_group="0"
-                    sensitivity="-37.0"
-                    max_spl="132.5"
-                    min_spl="28.5"
-                    directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI"
-                    num_frequency_responses="93"
-                    frequencies="97.16 102.92 109.02 115.48 122.32 129.57 137.25 145.38 153.99 163.12 172.78 183.02 193.87 205.35 217.52 230.41 244.06 258.52 273.84 290.07 307.26 325.46 344.75 365.17 386.81 409.73 434.01 459.73 486.97 515.82 546.39 578.76 613.06 649.38 687.86 728.62 771.79 817.52 865.96 917.28 971.63 1029.20 1090.18 1154.78 1223.21 1295.69 1372.46 1453.78 1539.93 1631.17 1727.83 1830.21 1938.65 2053.53 2175.20 2304.09 2440.62 2585.23 2738.42 2900.68 3072.56 3254.62 3447.47 3651.74 3868.12 4097.32 4340.10 4597.27 4869.68 5158.22 5463.87 5787.62 6130.56 6493.82 6878.60 7286.18 7717.92 8175.23 8659.64 9172.76 9716.28 10292.01 10901.84 11547.82 12232.07 12956.87 13724.61 14537.84 15399.27 16311.73 17278.26 18302.06 19386.53"
-                    responses="-0.40 -0.40 -0.60 -0.70 -0.40 -0.40 -0.30 -0.30 -0.30 -0.30 -0.20 -0.60 -0.90 -0.90 -1.00 -0.70 -0.80 -0.70 -0.70 -0.90 -0.70 -0.20 0.60 1.40 1.70 0.80 -0.80 -2.10 -2.30 -1.70 -0.90 0.50 1.30 1.20 0.80 0.10 0.20 0.40 2.30 2.40 0.00 -0.40 -0.10 0.70 -0.40 1.00 0.50 1.40 2.40 2.00 2.50 2.70 1.70 1.40 1.70 -1.90 -3.60 1.70 2.30 0.00 0.80 -0.30 0.60 1.90 1.40 -1.90 0.30 1.70 -0.60 0.40 2.20 3.60 -4.20 2.50 3.60 8.10 -4.30 5.70 7.30 9.60 7.80 10.20 16.40 18.60 20.10 22.50 23.50 17.60 17.90 18.80 17.70 15.10 14.70"
-                    geometric_location="0.0513 0.0 0.0038"
-                    orientation="0.0 -1.0 0.0"
-        />
-        <microphone device_id="builtin_mic2"
-                    id="0"
-                    device="AUDIO_DEVICE_IN_BACK_MIC"
-                    address="back"
-                    location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
-                    group="0"
-                    index_in_the_group="0"
-                    sensitivity="-37.0"
-                    max_spl="132.5"
-                    min_spl="28.5"
-                    directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI"
-                    num_frequency_responses="93"
-                    frequencies="97.16 102.92 109.02 115.48 122.32 129.57 137.25 145.38 153.99 163.12 172.78 183.02 193.87 205.35 217.52 230.41 244.06 258.52 273.84 290.07 307.26 325.46 344.75 365.17 386.81 409.73 434.01 459.73 486.97 515.82 546.39 578.76 613.06 649.38 687.86 728.62 771.79 817.52 865.96 917.28 971.63 1029.20 1090.18 1154.78 1223.21 1295.69 1372.46 1453.78 1539.93 1631.17 1727.83 1830.21 1938.65 2053.53 2175.20 2304.09 2440.62 2585.23 2738.42 2900.68 3072.56 3254.62 3447.47 3651.74 3868.12 4097.32 4340.10 4597.27 4869.68 5158.22 5463.87 5787.62 6130.56 6493.82 6878.60 7286.18 7717.92 8175.23 8659.64 9172.76 9716.28 10292.01 10901.84 11547.82 12232.07 12956.87 13724.61 14537.84 15399.27 16311.73 17278.26 18302.06 19386.53"
-                    responses="-0.40 -0.40 -0.60 -0.70 -0.40 -0.40 -0.30 -0.30 -0.30 -0.30 -0.20 -0.60 -0.90 -0.90 -1.00 -0.70 -0.80 -0.70 -0.70 -0.90 -0.70 -0.20 0.60 1.40 1.70 0.80 -0.80 -2.10 -2.30 -1.70 -0.90 0.50 1.30 1.20 0.80 0.10 0.20 0.40 2.30 2.40 0.00 -0.40 -0.10 0.70 -0.40 1.00 0.50 1.40 2.40 2.00 2.50 2.70 1.70 1.40 1.70 -1.90 -3.60 1.70 2.30 0.00 0.80 -0.30 0.60 1.90 1.40 -1.90 0.30 1.70 -0.60 0.40 2.20 3.60 -4.20 2.50 3.60 8.10 -4.30 5.70 7.30 9.60 7.80 10.20 16.40 18.60 20.10 22.50 23.50 17.60 17.90 18.80 17.70 15.10 14.70"
-                    geometric_location="0.0513 0.0 0.0038"
-                    orientation="0.0 -1.0 0.0"
-        />
-    </microphone_characteristics>
-</audio_board_info>
diff --git a/proprietary/vendor/etc/mixer_usb_default.xml b/proprietary/vendor/etc/mixer_usb_default.xml
index 3ab766d..a57f954 100644
--- a/proprietary/vendor/etc/mixer_usb_default.xml
+++ b/proprietary/vendor/etc/mixer_usb_default.xml
@@ -1,342 +1,333 @@
 <mixer>
-  <!-- These paths are for USB Audio device with default codec -->
-    <ctl name="Headset Playback Volume" value="68 68" />
-
-  <!-- Output mixer settings -->
-    <!-- Playback paths -->
-    <path name="media-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="112 112" />
-    </path>
-
-    <path name="media-speaker-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="69 69" />
-    </path>
-
-    <path name="media-speaker-bottom-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="69 69" />
-    </path>
-
-    <!-- FM Radio paths -->
-    <path name="fm_radio-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="112 112" />
-    </path>
-
-    <!-- USBFM Radio paths -->
-    <path name="usbfm_radio-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="112 112" />
-    </path>
-
-    <!-- Remote MIC playback paths -->
-    <path name="remote_mic-comp-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="112 112" />
-    </path>
-
-    <path name="remote_mic-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="112 112" />
-    </path>
-
-    <!-- Ringtone playback paths -->
-    <path name="ringtone-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="68 68" />
-    </path>
-
-    <path name="ringtone-speaker-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="68 68" />
-    </path>
-
-    <path name="ringtone-speaker-bottom-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="68 68" />
-    </path>
-
-    <!-- APCall(Communication) playback paths -->
-    <path name="communication-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- samsung voip fmc playback -->
-    <path name="samsung_voip_fmc-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoIP playback paths -->
-    <path name="voip-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="109 109" />
-    </path>
-
-    <!-- WiFICall playback paths -->
-    <!-- WiFiCall AP NB -->
-    <path name="wificall_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- WiFiCall AP WB -->
-    <path name="wificall_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- WiFiCall AP EVS -->
-    <path name="wificall_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VideoCall playback paths -->
-    <path name="video_call-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoiceCall paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="incall_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="incall_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="incall_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTECall CP NB -->
-    <path name="volte_cp_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTECall CP WB -->
-    <path name="volte_cp_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTECall CP EVS -->
-    <path name="volte_cp_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTECall CP FB -->
-    <path name="volte_cp_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTE VideoCall CP NB -->
-    <path name="volte_vt_cp_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTE VideoCall CP WB -->
-    <path name="volte_vt_cp_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTE VideoCall CP EVS -->
-    <path name="volte_vt_cp_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- VoLTE VideoCall CP FB -->
-    <path name="volte_vt_cp_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="115 115" />
-    </path>
-
-    <!-- TTY Mode -->
-    <path name="tty_mode-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- AP TTY Mode -->
-    <path name="ap_tty_mode-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-  <!-- Input mixer settings -->
-    <!-- Capture paths -->
-    <path name="media-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="93" />
-    </path>
-
-    <!-- Karaoke Listenback MIC paths -->
-    <path name="listenback-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="110" />
-    </path>
-
-    <!-- Voice Recording paths -->
-    <path name="recording-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="91" />
-    </path>
-
-    <!-- Camcording paths -->
-    <path name="camcorder-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="91" />
-    </path>
-
-    <!-- Recognition Input paths -->
-    <path name="recognition-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- bargein samsung input -->
-    <path name="bargein_samsung_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- bargein external input -->
-    <path name="bargein_external_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- svoice/carmode samsung input -->
-    <path name="dualmic_samsung_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- svoice/carmode external input -->
-    <path name="dualmic_external_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- APCall TX paths -->
-    <path name="communication-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoIP Input paths -->
-    <path name="voip-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- samsung voip fmc input -->
-    <path name="samsung_voip_fmc-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- WiFiCall Input paths -->
-    <!-- WiFiCall AP NB -->
-    <path name="wificall_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- WiFiCall AP WB -->
-    <path name="wificall_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- WiFiCall AP EVS -->
-    <path name="wificall_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- Video Call Input paths -->
-    <path name="video_call-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoiceCall TX paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="incall_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="incall_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="incall_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoLTECall TX paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="volte_cp_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="volte_cp_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoiceCall CP EVS -->
-    <path name="volte_cp_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="volte_cp_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoLTE VideoCall TX paths -->
-    <!-- VoLTE VideoCall CP NB -->
-    <path name="volte_vt_cp_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoLTE VideoCall CP WB -->
-    <path name="volte_vt_cp_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoLTE VideoCall CP EVS -->
-    <path name="volte_vt_cp_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- VoLTE VideoCall CP FB -->
-    <path name="volte_vt_cp_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- TTY Mode Input paths -->
-    <path name="tty_mode-usb-full-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <path name="tty_mode-usb-hco-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- AP TTY Mode Input paths -->
-    <path name="ap_tty_mode-usb-full-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <path name="ap_tty_mode-usb-hco-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-  <!-- Factory test paths -->
-    <!-- Packet Loopback -->
-    <path name="loopback_packet-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="120 120" />
-    </path>
-
-    <!-- Packet Loopback FB -->
-    <path name="loopback_packet_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="120 120" />
-    </path>
-
-    <!-- Realtime Loopback -->
-    <path name="realtimeloopback-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="120 120" />
-    </path>
-
-    <!-- Input -->
-    <!-- Packet Loopback Input -->
-    <path name="loopback_packet-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="110" />
-    </path>
-
-    <!-- Packet Loopback FB Input -->
-    <path name="loopback_packet_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="110" />
-    </path>
-
-    <!-- Realtime Loopback Input -->
-    <path name="realtimeloopback-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="110" />
-    </path>
+	<!-- These paths are for USB Audio device with default codec -->
+	<ctl name="Headset Playback Volume" value="68 68" />
+
+	<!-- Output mixer settings -->
+	<!-- Playback paths -->
+	<path name="media-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="112 112" />
+	</path>
+
+	<path name="media-speaker-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="63 63" />
+	</path>
+
+	<path name="media-speaker-bottom-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="69 69" />
+	</path>
+
+	<!-- USBFM Radio paths -->
+	<path name="usbfm_radio-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="112 112" />
+	</path>
+
+	<!-- Remote MIC playback paths -->
+	<path name="remote_mic-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="112 112" />
+	</path>
+
+	<!-- Ringtone playback paths -->
+	<path name="ringtone-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="68 68" />
+	</path>
+
+	<path name="ringtone-speaker-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="68 68" />
+	</path>
+
+	<path name="ringtone-speaker-bottom-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="68 68" />
+	</path>
+
+	<!-- APCall(Communication) playback paths -->
+	<path name="communication-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- samsung voip fmc playback -->
+	<path name="samsung_voip_fmc-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoIP playback paths -->
+	<path name="voip-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="109 109" />
+	</path>
+
+	<!-- WiFICall playback paths -->
+	<!-- WiFiCall AP NB -->
+	<path name="wificall_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- WiFiCall AP WB -->
+	<path name="wificall_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- WiFiCall AP EVS -->
+	<path name="wificall_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VideoCall playback paths -->
+	<path name="video_call-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoiceCall paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="incall_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="incall_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="incall_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTECall CP NB -->
+	<path name="volte_cp_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTECall CP WB -->
+	<path name="volte_cp_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTECall CP EVS -->
+	<path name="volte_cp_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTECall CP FB -->
+	<path name="volte_cp_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTE VideoCall CP NB -->
+	<path name="volte_vt_cp_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTE VideoCall CP WB -->
+	<path name="volte_vt_cp_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTE VideoCall CP EVS -->
+	<path name="volte_vt_cp_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- VoLTE VideoCall CP FB -->
+	<path name="volte_vt_cp_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="115 115" />
+	</path>
+
+	<!-- TTY Mode -->
+	<path name="tty_mode-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- AP TTY Mode -->
+	<path name="ap_tty_mode-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- Input mixer settings -->
+	<!-- Capture paths -->
+	<path name="media-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="93" />
+	</path>
+
+	<!-- Karaoke Listenback MIC paths -->
+	<path name="listenback-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="110" />
+	</path>
+
+	<!-- Voice Recording paths -->
+	<path name="recording-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="91" />
+	</path>
+
+	<!-- Camcording paths -->
+	<path name="camcorder-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="91" />
+	</path>
+
+	<!-- Recognition Input paths -->
+	<path name="recognition-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- bargein samsung input -->
+	<path name="bargein_samsung_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- bargein external input -->
+	<path name="bargein_external_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- svoice/carmode samsung input -->
+	<path name="dualmic_samsung_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- svoice/carmode external input -->
+	<path name="dualmic_external_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- APCall TX paths -->
+	<path name="communication-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoIP Input paths -->
+	<path name="voip-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- samsung voip fmc input -->
+	<path name="samsung_voip_fmc-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- WiFiCall Input paths -->
+	<!-- WiFiCall AP NB -->
+	<path name="wificall_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- WiFiCall AP WB -->
+	<path name="wificall_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- WiFiCall AP EVS -->
+	<path name="wificall_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- Video Call Input paths -->
+	<path name="video_call-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoiceCall TX paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="incall_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="incall_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="incall_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoLTECall TX paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="volte_cp_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="volte_cp_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoiceCall CP EVS -->
+	<path name="volte_cp_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="volte_cp_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoLTE VideoCall TX paths -->
+	<!-- VoLTE VideoCall CP NB -->
+	<path name="volte_vt_cp_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoLTE VideoCall CP WB -->
+	<path name="volte_vt_cp_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoLTE VideoCall CP EVS -->
+	<path name="volte_vt_cp_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- VoLTE VideoCall CP FB -->
+	<path name="volte_vt_cp_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- TTY Mode Input paths -->
+	<path name="tty_mode-usb-full-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<path name="tty_mode-usb-hco-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- AP TTY Mode Input paths -->
+	<path name="ap_tty_mode-usb-full-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<path name="ap_tty_mode-usb-hco-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Factory test paths -->
+	<!-- Packet Loopback -->
+	<path name="loopback_packet-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="120 120" />
+	</path>
+
+	<!-- Packet Loopback FB -->
+	<path name="loopback_packet_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="120 120" />
+	</path>
+
+	<!-- Realtime Loopback -->
+	<path name="realtimeloopback-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="120 120" />
+	</path>
+
+	<!-- Input -->
+	<!-- Packet Loopback Input -->
+	<path name="loopback_packet-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="110" />
+	</path>
+
+	<!-- Packet Loopback FB Input -->
+	<path name="loopback_packet_fb-usb-headset-mic-gain">
+			<ctl name="Headset Capture Volume" value="110" />
+	</path>
+
+	<!-- Realtime Loopback Input -->
+	<path name="realtimeloopback-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="110" />
+	</path>
 </mixer>
diff --git a/proprietary/vendor/etc/mixer_usb_gray.xml b/proprietary/vendor/etc/mixer_usb_gray.xml
index 7c7bdb0..a35d205 100644
--- a/proprietary/vendor/etc/mixer_usb_gray.xml
+++ b/proprietary/vendor/etc/mixer_usb_gray.xml
@@ -1,342 +1,333 @@
 <mixer>
-  <!-- These paths are for USB Audio device with gray codec -->
-    <ctl name="Headset Playback Volume" value="56 56" />
-
-  <!-- Output mixer settings -->
-    <!-- Playback paths -->
-    <path name="media-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="101 101" />
-    </path>
-
-    <path name="media-speaker-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="56 56" />
-    </path>
-
-    <path name="media-speaker-bottom-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="56 56" />
-    </path>
-
-    <!-- FM Radio paths -->
-    <path name="fm_radio-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="101 101" />
-    </path>
-
-    <!-- USBFM Radio paths -->
-    <path name="usbfm_radio-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="101 101" />
-    </path>
-
-    <!-- Remote MIC playback paths -->
-    <path name="remote_mic-comp-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="101 101" />
-    </path>
-
-    <path name="remote_mic-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="101 101" />
-    </path>
-
-    <!-- Ringtone playback paths -->
-    <path name="ringtone-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <path name="ringtone-speaker-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <path name="ringtone-speaker-bottom-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <!-- APCall(Communication) playback paths -->
-    <path name="communication-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- samsung voip fmc playback -->
-    <path name="samsung_voip_fmc-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoIP playback paths -->
-    <path name="voip-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- WiFICall playback paths -->
-    <!-- WiFiCall AP NB -->
-    <path name="wificall_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- WiFiCall AP WB -->
-    <path name="wificall_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- WiFiCall AP EVS -->
-    <path name="wificall_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VideoCall playback paths -->
-    <path name="video_call-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoiceCall paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="incall_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="incall_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="incall_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP NB -->
-    <path name="volte_cp_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP WB -->
-    <path name="volte_cp_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP EVS -->
-    <path name="volte_cp_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP FB -->
-    <path name="volte_cp_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP NB -->
-    <path name="volte_vt_cp_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP WB -->
-    <path name="volte_vt_cp_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP EVS -->
-    <path name="volte_vt_cp_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP FB -->
-    <path name="volte_vt_cp_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- TTY Mode -->
-    <path name="tty_mode-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- AP TTY Mode -->
-    <path name="ap_tty_mode-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-  <!-- Input mixer settings -->
-    <!-- Capture paths -->
-    <path name="media-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- Karaoke Listenback MIC paths -->
-    <path name="listenback-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="32" />
-    </path>
-
-    <!-- Voice Recording paths -->
-    <path name="recording-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="10" />
-    </path>
-
-    <!-- Camcording paths -->
-    <path name="camcorder-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="10" />
-    </path>
-
-    <!-- Recognition Input paths -->
-    <path name="recognition-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="57" />
-    </path>
-
-    <!-- bargein samsung input -->
-    <path name="bargein_samsung_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- bargein external input -->
-    <path name="bargein_external_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- svoice/carmode samsung input -->
-    <path name="dualmic_samsung_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="57" />
-    </path>
-
-    <!-- svoice/carmode external input -->
-    <path name="dualmic_external_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- APCall TX paths -->
-    <path name="communication-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoIP Input paths -->
-    <path name="voip-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- samsung voip fmc input -->
-    <path name="samsung_voip_fmc-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- WiFiCall Input paths -->
-    <!-- WiFiCall AP NB -->
-    <path name="wificall_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- WiFiCall AP WB -->
-    <path name="wificall_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- WiFiCall AP EVS -->
-    <path name="wificall_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- Video Call Input paths -->
-    <path name="video_call-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoiceCall TX paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="incall_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="incall_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="incall_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoLTECall TX paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="volte_cp_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="volte_cp_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoiceCall CP EVS -->
-    <path name="volte_cp_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="volte_cp_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoLTE VideoCall TX paths -->
-    <!-- VoLTE VideoCall CP NB -->
-    <path name="volte_vt_cp_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoLTE VideoCall CP WB -->
-    <path name="volte_vt_cp_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoLTE VideoCall CP EVS -->
-    <path name="volte_vt_cp_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- VoLTE VideoCall CP FB -->
-    <path name="volte_vt_cp_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="42" />
-    </path>
-
-    <!-- TTY Mode Input paths -->
-    <path name="tty_mode-usb-full-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <path name="tty_mode-usb-hco-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- AP TTY Mode Input paths -->
-    <path name="ap_tty_mode-usb-full-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <path name="ap_tty_mode-usb-hco-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-  <!-- Factory test paths -->
-    <!-- Packet Loopback -->
-    <path name="loopback_packet-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="100 100" />
-    </path>
-
-    <!-- Packet Loopback FB -->
-    <path name="loopback_packet_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="100 100" />
-    </path>
-
-    <!-- Realtime Loopback -->
-    <path name="realtimeloopback-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="100 100" />
-    </path>
-
-    <!-- Input -->
-    <!-- Packet Loopback Input -->
-    <path name="loopback_packet-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="40" />
-    </path>
-
-    <!-- Packet Loopback FB Input -->
-    <path name="loopback_packet_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="40" />
-    </path>
-
-    <!-- Realtime Loopback Input -->
-    <path name="realtimeloopback-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="40" />
-    </path>
+	<!-- These paths are for USB Audio device with gray codec -->
+	<ctl name="Headset Playback Volume" value="56 56" />
+
+	<!-- Output mixer settings -->
+	<!-- Playback paths -->
+	<path name="media-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="101 101" />
+	</path>
+
+	<path name="media-speaker-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="46 46" />
+	</path>
+
+	<path name="media-speaker-bottom-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="56 56" />
+	</path>
+
+	<!-- USBFM Radio paths -->
+	<path name="usbfm_radio-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="101 101" />
+	</path>
+
+	<!-- Remote MIC playback paths -->
+	<path name="remote_mic-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="101 101" />
+	</path>
+
+	<!-- Ringtone playback paths -->
+	<path name="ringtone-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<path name="ringtone-speaker-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<path name="ringtone-speaker-bottom-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<!-- APCall(Communication) playback paths -->
+	<path name="communication-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- samsung voip fmc playback -->
+	<path name="samsung_voip_fmc-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoIP playback paths -->
+	<path name="voip-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- WiFICall playback paths -->
+	<!-- WiFiCall AP NB -->
+	<path name="wificall_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- WiFiCall AP WB -->
+	<path name="wificall_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- WiFiCall AP EVS -->
+	<path name="wificall_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VideoCall playback paths -->
+	<path name="video_call-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoiceCall paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="incall_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="incall_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="incall_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP NB -->
+	<path name="volte_cp_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP WB -->
+	<path name="volte_cp_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP EVS -->
+	<path name="volte_cp_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP FB -->
+	<path name="volte_cp_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP NB -->
+	<path name="volte_vt_cp_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP WB -->
+	<path name="volte_vt_cp_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP EVS -->
+	<path name="volte_vt_cp_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP FB -->
+	<path name="volte_vt_cp_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- TTY Mode -->
+	<path name="tty_mode-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- AP TTY Mode -->
+	<path name="ap_tty_mode-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- Input mixer settings -->
+	<!-- Capture paths -->
+	<path name="media-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Karaoke Listenback MIC paths -->
+	<path name="listenback-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="32" />
+	</path>
+
+	<!-- Voice Recording paths -->
+	<path name="recording-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="10" />
+	</path>
+
+	<!-- Camcording paths -->
+	<path name="camcorder-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="10" />
+	</path>
+
+	<!-- Recognition Input paths -->
+	<path name="recognition-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="57" />
+	</path>
+
+	<!-- bargein samsung input -->
+	<path name="bargein_samsung_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- bargein external input -->
+	<path name="bargein_external_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- svoice/carmode samsung input -->
+	<path name="dualmic_samsung_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="57" />
+	</path>
+
+	<!-- svoice/carmode external input -->
+	<path name="dualmic_external_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- APCall TX paths -->
+	<path name="communication-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoIP Input paths -->
+	<path name="voip-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- samsung voip fmc input -->
+	<path name="samsung_voip_fmc-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- WiFiCall Input paths -->
+	<!-- WiFiCall AP NB -->
+	<path name="wificall_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- WiFiCall AP WB -->
+	<path name="wificall_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- WiFiCall AP EVS -->
+	<path name="wificall_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- Video Call Input paths -->
+	<path name="video_call-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoiceCall TX paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="incall_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="incall_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="incall_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoLTECall TX paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="volte_cp_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="volte_cp_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoiceCall CP EVS -->
+	<path name="volte_cp_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="volte_cp_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoLTE VideoCall TX paths -->
+	<!-- VoLTE VideoCall CP NB -->
+	<path name="volte_vt_cp_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoLTE VideoCall CP WB -->
+	<path name="volte_vt_cp_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoLTE VideoCall CP EVS -->
+	<path name="volte_vt_cp_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- VoLTE VideoCall CP FB -->
+	<path name="volte_vt_cp_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="42" />
+	</path>
+
+	<!-- TTY Mode Input paths -->
+	<path name="tty_mode-usb-full-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<path name="tty_mode-usb-hco-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- AP TTY Mode Input paths -->
+	<path name="ap_tty_mode-usb-full-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<path name="ap_tty_mode-usb-hco-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Factory test paths -->
+	<!-- Packet Loopback -->
+	<path name="loopback_packet-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="100 100" />
+	</path>
+
+	<!-- Packet Loopback FB -->
+	<path name="loopback_packet_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="100 100" />
+	</path>
+
+	<!-- Realtime Loopback -->
+	<path name="realtimeloopback-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="100 100" />
+	</path>
+
+	<!-- Input -->
+	<!-- Packet Loopback Input -->
+	<path name="loopback_packet-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="40" />
+	</path>
+
+	<!-- Packet Loopback FB Input -->
+	<path name="loopback_packet_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="40" />
+	</path>
+
+	<!-- Realtime Loopback Input -->
+	<path name="realtimeloopback-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="40" />
+	</path>
 </mixer>
diff --git a/proprietary/vendor/etc/mixer_usb_white.xml b/proprietary/vendor/etc/mixer_usb_white.xml
index 5c53a7c..8d210fc 100644
--- a/proprietary/vendor/etc/mixer_usb_white.xml
+++ b/proprietary/vendor/etc/mixer_usb_white.xml
@@ -1,342 +1,333 @@
 <mixer>
-  <!-- These paths are for USB Audio device with white codec -->
-    <ctl name="Headset Playback Volume" value="62 62" />
-
-  <!-- Output mixer settings -->
-    <!-- Playback paths -->
-    <path name="media-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <path name="media-speaker-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <path name="media-speaker-bottom-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <!-- FM Radio paths -->
-    <path name="fm_radio-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- USBFM Radio paths -->
-    <path name="usbfm_radio-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- Remote MIC playback paths -->
-    <path name="remote_mic-comp-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <path name="remote_mic-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- Ringtone playback paths -->
-    <path name="ringtone-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <path name="ringtone-speaker-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <path name="ringtone-speaker-bottom-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <!-- APCall(Communication) playback paths -->
-    <path name="communication-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <!-- samsung voip fmc playback -->
-    <path name="samsung_voip_fmc-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <!-- VoIP playback paths -->
-    <path name="voip-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="62 62" />
-    </path>
-
-    <!-- WiFICall playback paths -->
-    <!-- WiFiCall AP NB -->
-    <path name="wificall_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="104 104" />
-    </path>
-
-    <!-- WiFiCall AP WB -->
-    <path name="wificall_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- WiFiCall AP EVS -->
-    <path name="wificall_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VideoCall playback paths -->
-    <path name="video_call-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="104 104" />
-    </path>
-
-    <!-- VoiceCall paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="incall_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="incall_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="incall_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP NB -->
-    <path name="volte_cp_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- VoLTECall CP WB -->
-    <path name="volte_cp_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP EVS -->
-    <path name="volte_cp_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTECall CP FB -->
-    <path name="volte_cp_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP NB -->
-    <path name="volte_vt_cp_nb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- VoLTE VideoCall CP WB -->
-    <path name="volte_vt_cp_wb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP EVS -->
-    <path name="volte_vt_cp_evs-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- VoLTE VideoCall CP FB -->
-    <path name="volte_vt_cp_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-    <!-- TTY Mode -->
-    <path name="tty_mode-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="102 102" />
-    </path>
-
-    <!-- AP TTY Mode -->
-    <path name="ap_tty_mode-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="108 108" />
-    </path>
-
-  <!-- Input mixer settings -->
-    <!-- Capture paths -->
-    <path name="media-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- Karaoke Listenback MIC paths -->
-    <path name="listenback-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="32" />
-    </path>
-
-    <!-- Voice Recording paths -->
-    <path name="recording-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="10" />
-    </path>
-
-    <!-- Camcording paths -->
-    <path name="camcorder-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="10" />
-    </path>
-
-    <!-- Recognition Input paths -->
-    <path name="recognition-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- bargein samsung input -->
-    <path name="bargein_samsung_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- bargein external input -->
-    <path name="bargein_external_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- svoice/carmode samsung input -->
-    <path name="dualmic_samsung_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="120" />
-    </path>
-
-    <!-- svoice/carmode external input -->
-    <path name="dualmic_external_engine-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- APCall TX paths -->
-    <path name="communication-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="30" />
-    </path>
-
-    <!-- VoIP Input paths -->
-    <path name="voip-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="30" />
-    </path>
-
-    <!-- samsung voip fmc input -->
-    <path name="samsung_voip_fmc-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- WiFiCall Input paths -->
-    <!-- WiFiCall AP NB -->
-    <path name="wificall_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- WiFiCall AP WB -->
-    <path name="wificall_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="30" />
-    </path>
-
-    <!-- WiFiCall AP EVS -->
-    <path name="wificall_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="30" />
-    </path>
-
-    <!-- Video Call Input paths -->
-    <path name="video_call-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="30" />
-    </path>
-
-    <!-- VoiceCall TX paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="incall_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="incall_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="incall_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoLTECall TX paths -->
-    <!-- VoiceCall CP NB -->
-    <path name="volte_cp_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoiceCall CP WB -->
-    <path name="volte_cp_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoiceCall CP EVS -->
-    <path name="volte_cp_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoiceCall CP FB -->
-    <path name="volte_cp_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoLTE VideoCall TX paths -->
-    <!-- VoLTE VideoCall CP NB -->
-    <path name="volte_vt_cp_nb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoLTE VideoCall CP WB -->
-    <path name="volte_vt_cp_wb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoLTE VideoCall CP EVS -->
-    <path name="volte_vt_cp_evs-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- VoLTE VideoCall CP FB -->
-    <path name="volte_vt_cp_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="35" />
-    </path>
-
-    <!-- TTY Mode Input paths -->
-    <path name="tty_mode-usb-full-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <path name="tty_mode-usb-hco-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- AP TTY Mode Input paths -->
-    <path name="ap_tty_mode-usb-full-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <path name="ap_tty_mode-usb-hco-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-  <!-- Factory test paths -->
-    <!-- Packet Loopback -->
-    <path name="loopback_packet-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="85 85" />
-    </path>
-
-    <!-- Packet Loopback FB -->
-    <path name="loopback_packet_fb-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="85 85" />
-    </path>
-
-    <!-- Realtime Loopback -->
-    <path name="realtimeloopback-usb-headset-gain">
-        <ctl name="Headset Playback Volume" value="85 85" />
-    </path>
-
-    <!-- Input -->
-    <!-- Packet Loopback Input -->
-    <path name="loopback_packet-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- Packet Loopback FB Input -->
-    <path name="loopback_packet_fb-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
-
-    <!-- Realtime Loopback Input -->
-    <path name="realtimeloopback-usb-headset-mic-gain">
-        <ctl name="Headset Capture Volume" value="62" />
-    </path>
+	<!-- These paths are for USB Audio device with white codec -->
+	<ctl name="Headset Playback Volume" value="62 62" />
+
+	<!-- Output mixer settings -->
+	<!-- Playback paths -->
+	<path name="media-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<path name="media-speaker-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<path name="media-speaker-bottom-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<!-- USBFM Radio paths -->
+	<path name="usbfm_radio-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<!-- Remote MIC playback paths -->
+	<path name="remote_mic-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<!-- Ringtone playback paths -->
+	<path name="ringtone-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<path name="ringtone-speaker-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<path name="ringtone-speaker-bottom-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<!-- APCall(Communication) playback paths -->
+	<path name="communication-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<!-- samsung voip fmc playback -->
+	<path name="samsung_voip_fmc-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<!-- VoIP playback paths -->
+	<path name="voip-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="62 62" />
+	</path>
+
+	<!-- WiFICall playback paths -->
+	<!-- WiFiCall AP NB -->
+	<path name="wificall_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="104 104" />
+	</path>
+
+	<!-- WiFiCall AP WB -->
+	<path name="wificall_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- WiFiCall AP EVS -->
+	<path name="wificall_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VideoCall playback paths -->
+	<path name="video_call-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="104 104" />
+	</path>
+
+	<!-- VoiceCall paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="incall_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="incall_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="incall_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP NB -->
+	<path name="volte_cp_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<!-- VoLTECall CP WB -->
+	<path name="volte_cp_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP EVS -->
+	<path name="volte_cp_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTECall CP FB -->
+	<path name="volte_cp_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP NB -->
+	<path name="volte_vt_cp_nb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<!-- VoLTE VideoCall CP WB -->
+	<path name="volte_vt_cp_wb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP EVS -->
+	<path name="volte_vt_cp_evs-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- VoLTE VideoCall CP FB -->
+	<path name="volte_vt_cp_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- TTY Mode -->
+	<path name="tty_mode-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="102 102" />
+	</path>
+
+	<!-- AP TTY Mode -->
+	<path name="ap_tty_mode-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="108 108" />
+	</path>
+
+	<!-- Input mixer settings -->
+	<!-- Capture paths -->
+	<path name="media-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Karaoke Listenback MIC paths -->
+	<path name="listenback-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="32" />
+	</path>
+
+	<!-- Voice Recording paths -->
+	<path name="recording-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="10" />
+	</path>
+
+	<!-- Camcording paths -->
+	<path name="camcorder-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="10" />
+	</path>
+
+	<!-- Recognition Input paths -->
+	<path name="recognition-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- bargein samsung input -->
+	<path name="bargein_samsung_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- bargein external input -->
+	<path name="bargein_external_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- svoice/carmode samsung input -->
+	<path name="dualmic_samsung_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="120" />
+	</path>
+
+	<!-- svoice/carmode external input -->
+	<path name="dualmic_external_engine-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- APCall TX paths -->
+	<path name="communication-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="30" />
+	</path>
+
+	<!-- VoIP Input paths -->
+	<path name="voip-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="30" />
+	</path>
+
+	<!-- samsung voip fmc input -->
+	<path name="samsung_voip_fmc-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- WiFiCall Input paths -->
+	<!-- WiFiCall AP NB -->
+	<path name="wificall_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- WiFiCall AP WB -->
+	<path name="wificall_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="30" />
+	</path>
+
+	<!-- WiFiCall AP EVS -->
+	<path name="wificall_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="30" />
+	</path>
+
+	<!-- Video Call Input paths -->
+	<path name="video_call-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="30" />
+	</path>
+
+	<!-- VoiceCall TX paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="incall_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="incall_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="incall_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoLTECall TX paths -->
+	<!-- VoiceCall CP NB -->
+	<path name="volte_cp_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoiceCall CP WB -->
+	<path name="volte_cp_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoiceCall CP EVS -->
+	<path name="volte_cp_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoiceCall CP FB -->
+	<path name="volte_cp_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoLTE VideoCall TX paths -->
+	<!-- VoLTE VideoCall CP NB -->
+	<path name="volte_vt_cp_nb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoLTE VideoCall CP WB -->
+	<path name="volte_vt_cp_wb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoLTE VideoCall CP EVS -->
+	<path name="volte_vt_cp_evs-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- VoLTE VideoCall CP FB -->
+	<path name="volte_vt_cp_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="35" />
+	</path>
+
+	<!-- TTY Mode Input paths -->
+	<path name="tty_mode-usb-full-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<path name="tty_mode-usb-hco-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- AP TTY Mode Input paths -->
+	<path name="ap_tty_mode-usb-full-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<path name="ap_tty_mode-usb-hco-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Factory test paths -->
+	<!-- Packet Loopback -->
+	<path name="loopback_packet-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="85 85" />
+	</path>
+
+	<!-- Packet Loopback FB -->
+	<path name="loopback_packet_fb-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="85 85" />
+	</path>
+
+	<!-- Realtime Loopback -->
+	<path name="realtimeloopback-usb-headset-gain">
+		<ctl name="Headset Playback Volume" value="85 85" />
+	</path>
+
+	<!-- Input -->
+	<!-- Packet Loopback Input -->
+	<path name="loopback_packet-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Packet Loopback FB Input -->
+	<path name="loopback_packet_fb-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
+
+	<!-- Realtime Loopback Input -->
+	<path name="realtimeloopback-usb-headset-mic-gain">
+		<ctl name="Headset Capture Volume" value="62" />
+	</path>
 </mixer>
diff --git a/proprietary/vendor/etc/sec_audio_volume_curve.xml b/proprietary/vendor/etc/sec_audio_volume_curve.xml
new file mode 100644
index 0000000..de27b76
--- /dev/null
+++ b/proprietary/vendor/etc/sec_audio_volume_curve.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Audio Volume Curve Configuration file -->
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- Volume section -->
+    <xi:include href="audio_policy_volumes.xml"/>
+    <xi:include href="default_volume_tables.xml"/>
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>
diff --git a/proprietary/vendor/lib64/hw/audio.primary.s5e8825.so b/proprietary/vendor/lib64/hw/audio.primary.s5e8825.so
new file mode 100644
index 0000000..bb34d0e
Binary files /dev/null and b/proprietary/vendor/lib64/hw/audio.primary.s5e8825.so differ
diff --git a/proprietary/vendor/lib64/hw/audio.sec_primary.default.so b/proprietary/vendor/lib64/hw/audio.sec_primary.default.so
new file mode 100644
index 0000000..9a18b02
Binary files /dev/null and b/proprietary/vendor/lib64/hw/audio.sec_primary.default.so differ
diff --git a/proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so b/proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so
deleted file mode 100644
index 6416e50..0000000
Binary files a/proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so b/proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so
deleted file mode 100644
index 4c40014..0000000
Binary files a/proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libaboxpcmdump.so b/proprietary/vendor/lib64/libaboxpcmdump.so
new file mode 100644
index 0000000..44dac2d
Binary files /dev/null and b/proprietary/vendor/lib64/libaboxpcmdump.so differ
diff --git a/proprietary/vendor/lib64/libalsautils_sec.so b/proprietary/vendor/lib64/libalsautils_sec.so
new file mode 100644
index 0000000..6bccaec
Binary files /dev/null and b/proprietary/vendor/lib64/libalsautils_sec.so differ
diff --git a/proprietary/vendor/lib64/libaudio-ril.so b/proprietary/vendor/lib64/libaudio-ril.so
new file mode 100644
index 0000000..b4a9ccb
Binary files /dev/null and b/proprietary/vendor/lib64/libaudio-ril.so differ
diff --git a/proprietary/vendor/lib64/libaudioparamupdate.so b/proprietary/vendor/lib64/libaudioparamupdate.so
new file mode 100644
index 0000000..d9251ba
Binary files /dev/null and b/proprietary/vendor/lib64/libaudioparamupdate.so differ
diff --git a/proprietary/vendor/lib64/libaudioproxy2.so b/proprietary/vendor/lib64/libaudioproxy2.so
new file mode 100644
index 0000000..484d428
Binary files /dev/null and b/proprietary/vendor/lib64/libaudioproxy2.so differ
diff --git a/proprietary/vendor/lib64/libaudioroute.s5e8825.so b/proprietary/vendor/lib64/libaudioroute.s5e8825.so
new file mode 100644
index 0000000..66937bd
Binary files /dev/null and b/proprietary/vendor/lib64/libaudioroute.s5e8825.so differ
diff --git a/proprietary/vendor/lib64/libdatamod.so b/proprietary/vendor/lib64/libdatamod.so
new file mode 100644
index 0000000..19ea4c6
Binary files /dev/null and b/proprietary/vendor/lib64/libdatamod.so differ
diff --git a/proprietary/vendor/lib64/libfloatingfeature.so b/proprietary/vendor/lib64/libfloatingfeature.so
index c7c4761..9cd6d5f 100644
Binary files a/proprietary/vendor/lib64/libfloatingfeature.so and b/proprietary/vendor/lib64/libfloatingfeature.so differ
diff --git a/proprietary/vendor/lib64/liblastaboxmsg.so b/proprietary/vendor/lib64/liblastaboxmsg.so
new file mode 100644
index 0000000..5f3fc2e
Binary files /dev/null and b/proprietary/vendor/lib64/liblastaboxmsg.so differ
diff --git a/proprietary/vendor/lib64/libsecaudiocoreutils.so b/proprietary/vendor/lib64/libsecaudiocoreutils.so
index 9ec51e3..55219cd 100644
Binary files a/proprietary/vendor/lib64/libsecaudiocoreutils.so and b/proprietary/vendor/lib64/libsecaudiocoreutils.so differ
diff --git a/proprietary/vendor/lib64/libsecaudioinfo.so b/proprietary/vendor/lib64/libsecaudioinfo.so
index c447451..8b206c7 100644
Binary files a/proprietary/vendor/lib64/libsecaudioinfo.so and b/proprietary/vendor/lib64/libsecaudioinfo.so differ
diff --git a/proprietary/vendor/lib64/libsecaudiolevel.so b/proprietary/vendor/lib64/libsecaudiolevel.so
new file mode 100644
index 0000000..19ae6c1
Binary files /dev/null and b/proprietary/vendor/lib64/libsecaudiolevel.so differ
diff --git a/proprietary/vendor/lib64/libsecnativefeature.so b/proprietary/vendor/lib64/libsecnativefeature.so
index 6d15443..31d1e48 100644
Binary files a/proprietary/vendor/lib64/libsecnativefeature.so and b/proprietary/vendor/lib64/libsecnativefeature.so differ
diff --git a/proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so b/proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so
new file mode 100644
index 0000000..0104845
Binary files /dev/null and b/proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so differ
diff --git a/proprietary/vendor/lib64/libspeakercalibration.so b/proprietary/vendor/lib64/libspeakercalibration.so
new file mode 100644
index 0000000..dd5b801
Binary files /dev/null and b/proprietary/vendor/lib64/libspeakercalibration.so differ
diff --git a/proprietary/vendor/lib64/libtinyalsa.s5e8825.so b/proprietary/vendor/lib64/libtinyalsa.s5e8825.so
new file mode 100644
index 0000000..6adb36b
Binary files /dev/null and b/proprietary/vendor/lib64/libtinyalsa.s5e8825.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so b/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so
deleted file mode 100644
index 1e181d7..0000000
Binary files a/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/soundfx/libmyspace.so b/proprietary/vendor/lib64/soundfx/libmyspace.so
deleted file mode 100644
index 4dc2009..0000000
Binary files a/proprietary/vendor/lib64/soundfx/libmyspace.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so
new file mode 100644
index 0000000..69212f4
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so
new file mode 100644
index 0000000..cdf8023
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 3357970..df99827 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -6,7 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/samsung/s5e8825-common
 
 PRODUCT_COPY_FILES += \
-    vendor/samsung/s5e8825-common/proprietary/vendor/etc/audio_board_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_board_info.xml \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/DQE_coef_data.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/DQE_coef_data.xml \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/calib_data_atc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/calib_data_atc.xml \
@@ -38,6 +38,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/plmn_delta_chn.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_chn.bin \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/plmn_delta_hktw.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_hktw.bin \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/plmn_se13_prebuilt.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_se13_prebuilt.bin \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/sec_audio_volume_curve.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sec_audio_volume_curve.xml \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
     vendor/samsung/s5e8825-common/proprietary/vendor/firmware/APSV_AUDIO_SLSI.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/APSV_AUDIO_SLSI.bin \
     vendor/samsung/s5e8825-common/proprietary/vendor/firmware/OD_V2.1.6_01_26_QVGA.nnc:$(TARGET_COPY_OUT_VENDOR)/firmware/OD_V2.1.6_01_26_QVGA.nnc \
@@ -57,6 +58,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libGLES_mali \
     android.hardware.gnss@2.1-impl \
+    audio.primary.s5e8825 \
+    audio.sec_primary.default \
     gatekeeper.s5e8825 \
     vendor.samsung.hardware.gnss@2.1-impl \
     vulkan.mali \
@@ -65,12 +68,17 @@ PRODUCT_PACKAGES += \
     libVendorSemDataProps \
     libVendorSemTelephonyProps \
     lib_SamsungRec_07010 \
-    lib_SoundAlive_3DPosition_ver202 \
-    lib_SoundAlive_AlbumArt_ver105 \
     lib_SoundAlive_SRC384_ver320 \
     lib_soundaliveresampler \
+    libaboxpcmdump \
+    libalsautils_sec \
+    libaudio-ril \
+    libaudioparamupdate \
+    libaudioproxy2 \
+    libaudioroute.s5e8825 \
     libc++_shared \
     libcrypto-tm \
+    libdatamod \
     libdpuhdr10p_8825 \
     libegis_fp_normal_sensor_test \
     libengmode_client \
@@ -81,6 +89,7 @@ PRODUCT_PACKAGES += \
     libhdr10p_meta_plugin_default \
     libhdr_plugin_exynos8825 \
     libhwjsqz \
+    liblastaboxmsg \
     liboemcrypto \
     libprofileparamstorage \
     libqfp_sensortest \
@@ -89,16 +98,20 @@ PRODUCT_PACKAGES += \
     libsec-ril \
     libsecaudiocoreutils \
     libsecaudioinfo \
+    libsecaudiolevel \
     libsecnativefeature \
     libsecril-client \
+    libsehbluetooth_audio_session_aidl \
     libsemnativecarrierfeature \
     libsensorlistener \
     libskeymint10device \
     libskeymint_cli \
     libspatializerparamstorage \
+    libspeakercalibration \
     libswcnr \
     libsynaFpSensorTestNwd \
     libteecl \
+    libtinyalsa.s5e8825 \
     libuniapi \
     libuniplugin \
     libuuid_vendor \
@@ -108,9 +121,9 @@ PRODUCT_PACKAGES += \
     sensors.grip \
     sensors.inputvirtual \
     sensors.sensorhub \
-    libaudioeffectoffload \
-    libmyspace \
     libswdap \
+    vendor.samsung.hardware.audio-V1-ndk \
+    vendor.samsung.hardware.bluetooth.audio-V1-ndk \
     vendor.samsung.hardware.gnss@2.0 \
     vendor.samsung.hardware.gnss@2.1 \
     vendor.samsung.hardware.keymint-V1-ndk_platform \