diff --git a/BoardConfig.mk b/BoardConfig.mk
index 30d2522..972d746 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -44,15 +44,10 @@ TARGET_KERNEL_CONFIG := msm8974_sec_defconfig
 TARGET_KERNEL_VARIANT_CONFIG := msm8974_sec_viennalteeur_cm_defconfig
 
 # Audio
-BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
-BOARD_HAVE_SAMSUNG_AUDIO := true
-BOARD_USES_FLUENCE_INCALL := true
-BOARD_USES_FLUENCE_FOR_VOIP := true
-BOARD_USES_SEPERATED_AUDIO_INPUT := true
-AUDIO_FEATURE_DISABLED_MULTI_VOICE_SESSIONS := true
-AUDIO_FEATURE_DISABLED_FM := true
-AUDIO_FEATURE_DISABLED_ANC_HEADSET := true
-USE_CUSTOM_AUDIO_POLICY := 1
+QCOM_CSDCLIENT_ENABLED := false
+AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true
+AUDIO_FEATURE_ENABLED_HWDEP_CAL := true
+AUDIO_FEATURE_ENABLED_LOW_LATENCY_CAPTURE := true
 
 # Camera
 TARGET_PROVIDES_CAMERA_HAL := true
@@ -61,13 +56,8 @@ USE_DEVICE_SPECIFIC_CAMERA := true
 # Charger
 BOARD_CHARGER_SHOW_PERCENTAGE := true
 
-# GPS
-TARGET_NO_RPC := true
-TARGET_GPS_HAL_PATH := device/samsung/viennalte/gps
-
 # Graphics
 TARGET_HAVE_NEW_GRALLOC := true
-BOARD_USES_LEGACY_MMAP := true
 
 # Hardware
 BOARD_HARDWARE_CLASS += device/samsung/viennalte/cmhw
@@ -81,6 +71,9 @@ BOARD_BLUEDROID_VENDOR_CONF := device/samsung/viennalte/bluetooth/vnd_viennalte.
 BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY := false
 BOARD_HAVE_BLUETOOTH_BCM := true
 
+# ANT+
+BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
+
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 10485760
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 13631488
@@ -129,3 +122,5 @@ BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 WIFI_DRIVER_FW_PATH_AP      := "/system/etc/wifi/bcmdhd_apsta.bin"
 WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/dhd/parameters/firmware_path"
 WIFI_DRIVER_FW_PATH_STA     := "/system/etc/wifi/bcmdhd_sta.bin"
+WIFI_DRIVER_MODULE_ARG      := "firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
+WIFI_DRIVER_MODULE_AP_ARG   := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
diff --git a/include/sound/msmcal-hwdep.h b/include/sound/msmcal-hwdep.h
new file mode 100755
index 0000000..625e735
--- /dev/null
+++ b/include/sound/msmcal-hwdep.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _CALIB_HWDEP_H
+#define _CALIB_HWDEP_H
+#define WCD9XXX_CODEC_HWDEP_NODE 1000
+enum wcd_cal_type {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ WCD9XXX_MIN_CAL,
+ WCD9XXX_ANC_CAL = WCD9XXX_MIN_CAL,
+ WCD9XXX_MAD_CAL,
+ WCD9XXX_MBHC_CAL,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ WCD9XXX_MAX_CAL,
+};
+struct wcdcal_ioctl_buffer {
+ __u32 size;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+// __u8 __user *buffer;
+ void   *buffer;
+ enum wcd_cal_type cal_type;
+};
+#define SNDRV_CTL_IOCTL_HWDEP_CAL_TYPE   _IOW('U', 0x1, struct wcdcal_ioctl_buffer)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
+
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index dc8fae6..916ebbd 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -166,38 +166,38 @@
 <!-- Vibrator pattern for feedback about a long screen/key press -->
     <integer-array name="config_longPressVibePattern">
         <item>0</item>
-        <item>31</item>
-        <item>50</item>
-        <item>51</item>
+        <item>1</item>
+        <item>20</item>
+        <item>21</item>
     </integer-array>
 
     <!-- Vibrator pattern for feedback about touching a virtual key -->
     <integer-array name="config_virtualKeyVibePattern">
         <item>0</item>
-        <item>40</item>
-        <item>50</item>
-        <item>60</item>
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
     </integer-array>
 
     <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
     <integer-array name="config_keyboardTapVibePattern">
-        <item>50</item>
+        <item>10</item>
     </integer-array>
 
     <!-- Vibrator pattern for feedback about booting with safe mode disabled -->
     <integer-array name="config_safeModeDisabledVibePattern">
         <item>0</item>
-        <item>31</item>
-        <item>50</item>
-        <item>51</item>
+        <item>1</item>
+        <item>20</item>
+        <item>21</item>
     </integer-array>
 
     <!-- Vibrator pattern for feedback about booting with safe mode disabled -->
     <integer-array name="config_safeModeEnabledVibePattern">
         <item>0</item>
-        <item>31</item>
-        <item>50</item>
-        <item>51</item>
+        <item>1</item>
+        <item>20</item>
+        <item>21</item>
         <item>500</item>
         <item>600</item>
     </integer-array>
@@ -205,9 +205,9 @@
     <!-- Vibrator pattern for feedback about hitting a scroll barrier -->
     <integer-array name="config_scrollBarrierVibePattern">
         <item>0</item>
-        <item>45</item>
-        <item>40</item>
-        <item>40</item>
+        <item>15</item>
+        <item>10</item>
+        <item>10</item>
     </integer-array>
 
     <!-- Hide this setting because we are forcing it to be enabled in build.prop.
@@ -266,26 +266,20 @@
     <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,4194304,262144,524288,1048576</string>
 
     <string-array name="config_mobile_tcp_buffers">
-        <item>"lte:2097152,4194304,8388608,262144,524288,1048576"</item>
-        <item>"lte_ca:2097152,4194304,8388608,262144,524288,1048576"</item>
-        <item>"umts:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hspa:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hsupa:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"hsdpa:4094,87380,2441216,4096,16384,2441216"</item>
-        <item>"hspap:4094,87380,1220608,4096,16384,1220608"</item>
-        <item>"edge:4093,26280,35040,4096,16384,35040"</item>
-        <item>"gprs:4092,8760,11680,4096,8760,11680"</item>
-        <item>"evdo:4094,87380,1048576,4096,16384,262144"</item>
-        <item>"ehrpd:4094,87380,1048576,4096,16384,262144"</item>
+        <item>umts:4094,87380,110208,4096,16384,110208</item>
+        <item>hspa:4094,87380,1220608,4096,16384,1220608</item>
+        <item>hsupa:4094,87380,1220608,4096,16384,1220608</item>
+        <item>hsdpa:4094,87380,1220608,4096,16384,1220608</item>
+        <item>hspap:4094,87380,1220608,4096,16384,1220608</item>
+        <item>edge:4093,26280,35040,4096,16384,35040</item>
+        <item>gprs:4092,8760,11680,4096,8760,11680</item>
+        <item>evdo:4094,87380,262144,4096,16384,262144</item>
+        <item>lte:524288,1048576,2097152,262144,524288,1048576</item>
     </string-array>
 
     <!-- Boolean to enable stylus gestures -->
     <bool name="config_stylusGestures">true</bool>
 
-    <!-- Base "touch slop" value used by ViewConfiguration as a
-         movement threshold where scrolling should begin. -->
-    <dimen name="config_viewConfigurationTouchSlop">19dip</dimen>
-
     <!-- The RadioAccessFamilies supported by the device.
          Empty is viewed as "all".  Only used on devices which
          don't support RIL_REQUEST_GET_RADIO_CAPABILITY
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index a47c9d9..63739db 100755
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <device name="Android">
     <item name="none">0</item>
-    <item name="screen.on">71</item>
-    <item name="screen.full">380</item>
-    <item name="bluetooth.active">17</item>
-    <item name="bluetooth.on">0.3</item>
-    <item name="wifi.on">0.3</item>
-    <item name="wifi.active">96</item>
-    <item name="wifi.scan">70</item>
-    <item name="dsp.audio">44</item>
-    <item name="dsp.video">280</item>
-    <item name="radio.active">250</item>
-    <item name="radio.scanning">82</item>
-    <item name="gps.on">1</item>
+    <item name="screen.on">58</item>
+    <item name="bluetooth.active">98</item>
+    <item name="bluetooth.on">0.4</item>
+    <item name="screen.full">228</item>
+    <item name="wifi.on">0.5</item>
+    <item name="wifi.active">187</item>
+    <item name="wifi.scan">114</item>
+    <item name="dsp.audio">40</item>
+    <item name="dsp.video">251</item>
+    <item name="radio.active">155</item>
+    <item name="radio.scanning">25</item>
+    <item name="gps.on">0.3</item>
     <array name="radio.on">
-        <value>3.4</value>
-        <value>3.4</value>
+        <value>5.4</value>
+        <value>5.4</value>
     </array>
     <array name="cpu.speeds">
         <value>2265600</value>
-        <value>1782000</value>
+        <value>1728000</value>
         <value>1497600</value>
         <value>1190400</value>
         <value>960000</value>
@@ -39,11 +39,4 @@
         <value>46</value>
     </array>
     <item name="battery.capacity">9500</item>
-    <array name="wifi.batchedscan">
-        <value>.0002</value>
-        <value>.002</value>
-        <value>.02</value>
-        <value>.2</value>
-        <value>2</value>
-    </array>
-</device>
\ No newline at end of file
+</device>
diff --git a/system.prop b/system.prop
index 4510510..4a20b5e 100755
--- a/system.prop
+++ b/system.prop
@@ -1,3 +1,18 @@
+#audio
+persist.audio.fluence.speaker=true
+persist.audio.fluence.voicecall=true
+persist.audio.fluence.voicerec=false
+ro.qc.sdk.audio.fluencetype=fluence
+mm.enable.smoothstreaming=true
+av.streaming.offload.enable=true
+use.voice.path.for.pcm.voip=true
+audio.offload.multiple.enabled=true
+audio.offload.gapless.enabled=true
+tunnel.audio.encode=true
+media.aac_51_output_enabled=true
+audio.offload.pcm.16bit.enable=true
+audio.offload.pcm.24bit.enable=true
+
 # display
 lockscreen.rot_override=true
 ro.hdcp2.rx=tz
@@ -29,3 +44,6 @@ ro.telephony.ril_class=TabproLteRIL
 # CWMR Options
 ro.cwm.forbid_format=/boot,/firmware,/firmware-modem
 ro.cwm.forbid_mount=/boot
+
+# perf api
+ro.vendor.extension_library=/vendor/lib/libqti-perfd-client.so