diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 52cee13..75edae2 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -20,7 +20,7 @@
 
     <modules>
         <!-- Primary Audio HAL -->
-        <module name="primary" halVersion="2.0">
+        <module name="primary" halVersion="4.0">
             <attachedDevices>
                 <item>HDMI</item>
             </attachedDevices>
diff --git a/device.mk b/device.mk
index 8421988..6be485c 100644
--- a/device.mk
+++ b/device.mk
@@ -52,6 +52,7 @@
     com.android.media.tv.remoteprovider \
     InputDevices
 
+
 PRODUCT_PACKAGES +=  libGLES_mali
 PRODUCT_PACKAGES +=  libGLES_android
 
@@ -98,11 +99,10 @@
 
 PRODUCT_PACKAGES += \
     android.hardware.audio@2.0-service \
-    android.hardware.audio@2.0-impl \
-    android.hardware.audio.effect@2.0-impl \
+    android.hardware.audio@4.0-impl \
+    android.hardware.audio.effect@4.0-impl \
     android.hardware.broadcastradio@1.0-impl \
-    android.hardware.soundtrigger@2.0-impl \
-    android.hardware.bluetooth.audio@2.0-impl
+    android.hardware.soundtrigger@2.1-impl \
 
 # Hardware Composer HAL
 #
@@ -135,7 +135,7 @@
 
 # USB
 PRODUCT_PACKAGES += \
-	android.hardware.usb@1.0-service
+    android.hardware.usb@1.1-service
 
 PRODUCT_COPY_FILES +=  \
     frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
diff --git a/init.yukawa.usb.rc b/init.yukawa.usb.rc
index c3a6158..5adb52e 100644
--- a/init.yukawa.usb.rc
+++ b/init.yukawa.usb.rc
@@ -9,15 +9,24 @@
     write /config/usb_gadget/g1/strings/0x409/manufacturer SEI
     write /config/usb_gadget/g1/strings/0x409/product sei510
     mkdir /config/usb_gadget/g1/functions/ffs.adb
+    mkdir /config/usb_gadget/g1/functions/ffs.mtp
+    mkdir /config/usb_gadget/g1/functions/ffs.ptp
+    mkdir /config/usb_gadget/g1/functions/gsi.rndis
     mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
     mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
     write /config/usb_gadget/g1/configs/b.1/MaxPower 500
     mkdir /dev/usb-ffs 0775 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
+    mkdir /dev/usb-ffs/mtp 0770 mtp mtp
+    mkdir /dev/usb-ffs/ptp 0770 mtp mtp
     mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+    mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+    mount functionfs ptp /dev/usb-ffs/ptp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+    setprop sys.usb.mtp.device_type 3
     setprop sys.usb.configfs 1
     setprop sys.usb.controller "ff400000.usb"
     symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
+    write /config/usb_gadget/g1/functions/gsi.rndis/rndis_class_id 1
 
 
 on property:sys.usb.config=none && property:sys.usb.configfs=1