diff --git a/build.cmd b/build.cmd
index 31621c378..ae2e5a172 100644
--- a/build.cmd
+++ b/build.cmd
@@ -53,10 +53,14 @@ EXIT /B %ERRORLEVEL%
   ECHO ************************
   ECHO * Copying binaries
   ECHO ************************
-  CALL :mkcp libs\armeabi-v7a\* zip_static\arm
-  CALL :mkcp libs\arm64-v8a\* zip_static\arm64
-  CALL :mkcp libs\x86\* zip_static\x86
-  CALL :mkcp libs\x86_64\* zip_static\x64
+  CALL :mkcp libs\armeabi-v7a\magisk zip_static\arm
+  CALL :mkcp libs\armeabi-v7a\magiskboot zip_static\arm
+  CALL :mkcp libs\arm64-v8a\magisk zip_static\arm64
+  CALL :mkcp libs\arm64-v8a\magiskboot zip_static\arm64
+  CALL :mkcp libs\x86\magisk zip_static\x86
+  CALL :mkcp libs\x86\magiskboot zip_static\x86
+  CALL :mkcp libs\x86_64\magisk zip_static\x64
+  CALL :mkcp libs\x86_64\magiskboot zip_static\x64
   CALL :mkcp libs\armeabi-v7a\magiskboot uninstaller\arm
   CALL :mkcp libs\arm64-v8a\magiskboot uninstaller\arm64
   CALL :mkcp libs\x86\magiskboot uninstaller\x86
diff --git a/build.sh b/build.sh
index f3a8ab05a..fca479825 100755
--- a/build.sh
+++ b/build.sh
@@ -55,13 +55,17 @@ build_bin() {
   echo "************************"
   echo "* Copying binaries"
   echo "************************"
-  mkcp "libs/armeabi-v7a/*" zip_static/arm
+  mkcp libs/armeabi-v7a/magisk zip_static/arm
+  mkcp libs/armeabi-v7a/magiskboot zip_static/arm
+  mkcp libs/arm64-v8a/magisk zip_static/arm64
+  mkcp libs/arm64-v8a/magiskboot zip_static/arm64
+  mkcp libs/x86/magisk zip_static/x86
+  mkcp libs/x86/magiskboot zip_static/x86
+  mkcp libs/x86_64/magisk zip_static/x64
+  mkcp libs/x86_64/magiskboot zip_static/x64
   mkcp libs/armeabi-v7a/magiskboot uninstaller/arm
-  mkcp "libs/arm64-v8a/*" zip_static/arm64
   mkcp libs/arm64-v8a/magiskboot uninstaller/arm64
-  mkcp "libs/x86/*" zip_static/x86
   mkcp libs/x86/magiskboot uninstaller/x86
-  mkcp "libs/x86_64/*" zip_static/x64
   mkcp libs/x86_64/magiskboot uninstaller/x64
 }
 
diff --git a/scripts/flash_script.sh b/scripts/flash_script.sh
index 005293bfa..b3d8796d7 100644
--- a/scripts/flash_script.sh
+++ b/scripts/flash_script.sh
@@ -256,65 +256,69 @@ fi
 # Environment
 ##########################################################################################
 
-ui_print "- Constructing environment"
+# TODO: Environment
 
-is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
+# ui_print "- Constructing environment"
 
-# Copy required files
-rm -rf $MAGISKBIN 2>/dev/null
-mkdir -p $MAGISKBIN
-cp -af $BINDIR/busybox $BINDIR/magiskboot $BINDIR/magiskpolicy $COMMONDIR/magisk.apk \
-       $COMMONDIR/init.magisk.rc  $COMMONDIR/custom_ramdisk_patch.sh $COMMONDIR/magic_mask.sh $MAGISKBIN
-# Legacy support
-ln -sf /data/magisk/magiskpolicy $MAGISKBIN/sepolicy-inject
+# is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
 
-chmod -R 755 $MAGISKBIN
-chcon -h u:object_r:system_file:s0 $MAGISKBIN $MAGISKBIN/*
+# # Copy required files
+# rm -rf $MAGISKBIN 2>/dev/null
+# mkdir -p $MAGISKBIN
+# cp -af $BINDIR/busybox $BINDIR/magiskboot $BINDIR/magiskpolicy $COMMONDIR/magisk.apk \
+#        $COMMONDIR/init.magisk.rc  $COMMONDIR/custom_ramdisk_patch.sh $COMMONDIR/magic_mask.sh $MAGISKBIN
+# # Legacy support
+# ln -sf /data/magisk/magiskpolicy $MAGISKBIN/sepolicy-inject
 
-# Temporary busybox for installation
-rm -rf $TMPDIR/busybox 2>/dev/null
-mkdir -p $TMPDIR/busybox
-$BINDIR/busybox --install -s $TMPDIR/busybox
-rm -f $TMPDIR/busybox/su $TMPDIR/busybox/sh $TMPDIR/busybox/reboot
-PATH=$TMPDIR/busybox:$PATH
+# chmod -R 755 $MAGISKBIN
+# chcon -h u:object_r:system_file:s0 $MAGISKBIN $MAGISKBIN/*
+
+# # Temporary busybox for installation
+# rm -rf $TMPDIR/busybox 2>/dev/null
+# mkdir -p $TMPDIR/busybox
+# $BINDIR/busybox --install -s $TMPDIR/busybox
+# rm -f $TMPDIR/busybox/su $TMPDIR/busybox/sh $TMPDIR/busybox/reboot
+# PATH=$TMPDIR/busybox:$PATH
 
 ##########################################################################################
 # Magisk Image
 ##########################################################################################
 
-# Fix SuperSU.....
-$BOOTMODE && $BINDIR/magiskpolicy --live "allow fsck * * *"
+# TODO: Magisk Image
 
-if (is_mounted /data); then
-  IMG=/data/magisk.img
-else
-  IMG=/cache/magisk.img
-  ui_print "- Data unavailable, use cache workaround"
-fi
+# # Fix SuperSU.....
+# $BOOTMODE && $BINDIR/magiskpolicy --live "allow fsck * * *"
 
-if [ -f $IMG ]; then
-  ui_print "- $IMG detected!"
-else
-  ui_print "- Creating $IMG"
-  make_ext4fs -l 64M -a /magisk -S $COMMONDIR/file_contexts_image $IMG
-fi
+# if (is_mounted /data); then
+#   IMG=/data/magisk.img
+# else
+#   IMG=/cache/magisk.img
+#   ui_print "- Data unavailable, use cache workaround"
+# fi
 
-mount_image $IMG /magisk
-if (! is_mounted /magisk); then
-  ui_print "! Magisk image mount failed..."
-  exit 1
-fi
-MAGISKLOOP=$LOOPDEVICE
+# if [ -f $IMG ]; then
+#   ui_print "- $IMG detected!"
+# else
+#   ui_print "- Creating $IMG"
+#   make_ext4fs -l 64M -a /magisk -S $COMMONDIR/file_contexts_image $IMG
+# fi
 
-# Core folders and scripts
-mkdir -p $COREDIR/bin $COREDIR/props $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null
-cp -af $COMMONDIR/magiskhide/. $COREDIR/magiskhide
-cp -af $BINDIR/resetprop $BINDIR/magiskhide $BINDIR/su $BINDIR/magiskpolicy $COREDIR/bin
-# Legacy support
-ln -sf $COREDIR/bin/resetprop $MAGISKBIN/resetprop
+# mount_image $IMG /magisk
+# if (! is_mounted /magisk); then
+#   ui_print "! Magisk image mount failed..."
+#   exit 1
+# fi
+# MAGISKLOOP=$LOOPDEVICE
 
-chmod -R 755 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
-chown -R 0.0 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
+# # Core folders and scripts
+# mkdir -p $COREDIR/bin $COREDIR/props $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null
+# cp -af $COMMONDIR/magiskhide/. $COREDIR/magiskhide
+# cp -af $BINDIR/resetprop $BINDIR/magiskhide $BINDIR/su $BINDIR/magiskpolicy $COREDIR/bin
+# # Legacy support
+# ln -sf $COREDIR/bin/resetprop $MAGISKBIN/resetprop
+
+# chmod -R 755 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
+# chown -R 0.0 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
 
 ##########################################################################################
 # Unpack boot
@@ -445,7 +449,7 @@ else
 
   # sepolicy patches
   cpio_extract sepolicy sepolicy
-  LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/magiskpolicy --load sepolicy --save sepolicy --minimal
+  LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/magisk magiskpolicy --load sepolicy --save sepolicy --minimal
   cpio_add 644 sepolicy sepolicy
 
   # Add new items
@@ -454,7 +458,8 @@ else
   [ ! -z $SHA1 ] && echo "# STOCKSHA1=$SHA1" >> $COMMONDIR/init.magisk.rc
   cpio_add 750 init.magisk.rc $COMMONDIR/init.magisk.rc
 
-  cpio_add 750 sbin/magic_mask.sh $COMMONDIR/magic_mask.sh
+  # cpio_add 750 sbin/magic_mask.sh $COMMONDIR/magic_mask.sh
+  cpio_add 755 sbin/magisk $BINDIR/magisk
 
   # Create ramdisk backups
   LD_LIBRARY_PATH=$SYSTEMLIB $BINDIR/magiskboot --cpio-backup ramdisk.cpio ramdisk.cpio.orig
diff --git a/scripts/init.magisk.rc b/scripts/init.magisk.rc
index c5e890d4a..b19a59a85 100644
--- a/scripts/init.magisk.rc
+++ b/scripts/init.magisk.rc
@@ -16,19 +16,19 @@ on property:magisk.restart_pfsd=1
 # Services
 
 # launch post-fs script
-service magisk_pfs /sbin/magic_mask.sh post-fs
+service magisk_pfs /sbin/magisk --post-fs
     user root
     seclabel u:r:su:s0
     oneshot
 
 # launch post-fs-data script
-service magisk_pfsd /sbin/magic_mask.sh post-fs-data
+service magisk_pfsd /sbin/magisk --post-fs-data
     user root
     seclabel u:r:su:s0
     oneshot
 
 # launch late_start script
-service magisk_service /sbin/magic_mask.sh service
+service magisk_service /sbin/magisk  --service
     class late_start
     user root
     seclabel u:r:su:s0