diff --git a/resources/firmware/src/target/iphone5/11B554a/exploit b/resources/firmware/src/target/iphone5/11B554a/exploit
index b01e0da..6f88570 100644
Binary files a/resources/firmware/src/target/iphone5/11B554a/exploit and b/resources/firmware/src/target/iphone5/11B554a/exploit differ
diff --git a/resources/firmware/src/target/iphone5/11B554a/partition b/resources/firmware/src/target/iphone5/11B554a/partition
index 192e458..e955fc6 100644
--- a/resources/firmware/src/target/iphone5/11B554a/partition
+++ b/resources/firmware/src/target/iphone5/11B554a/partition
@@ -39,7 +39,7 @@ if [ -e "/ios9" ]; then
   mv -v /mnt1/Library/LaunchDaemons/com.apple.jetsamproperties.*.plist /mnt1/System/Library/LaunchDaemons/
   sleep 3s
 
-   # step3
+  # step3
   mv -v /mnt1/usr/libexec/CrashHousekeeping /mnt1/usr/libexec/CrashHousekeeping_
   mv -v /mnt1/reloader /mnt1/usr/libexec/CrashHousekeeping
   sleep 1s
@@ -53,33 +53,38 @@ System_LastSector="$((echo -e "i\n1\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null |
 Data_LastSector="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Last sector: //p' | sed 's/ .*//')"
 Data_Attributeflags="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*flags: //p')"
 Exploit_LastSector="$((524288/$LogicalSector))"
-New_Data_LastSector="$(($Data_LastSector-$Exploit_LastSector))"
+BOOTLOADER="$((8388608/$LogicalSector))"
+NOTSD="$(($Exploit_LastSector+$BOOTLOADER))"
+Data_LastSectorSD="$(($Data_LastSector-$BOOTLOADER))"
+New_Data_LastSector="$(($Data_LastSector-$NOTSD))"
 New_Data_SectorSize="$(($New_Data_LastSector-$System_LastSector))"
 New_Data_Size="$(($New_Data_SectorSize*$LogicalSector))"
 
 hfs_resize /mnt1/private/var $New_Data_Size
 sleep 1s
 
-if [ "$Data_Attributeflags" = "0001000000000000" ]; then
-echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
-else
-echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
-fi
-
+echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSectorSD\n\nn\n4\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
 sleep 1s
 
+sleep 1s
 newfs_hfs -s -v exploit /dev/rdisk0s1s3
+newfs_hfs -s -v bootloader /dev/rdisk0s1s4
 sleep 1s
 fsck_hfs -f /dev/rdisk0s1s3
+fsck_hfs -f /dev/rdisk0s1s4
 sleep 2s
 
 dd of=/dev/rdisk0s1s3 if=/exploit bs=512k count=1
 sleep 1s
+mount_hfs /dev/disk0s1s4 /mnt2
 
 nvram -c
 nvram boot-partition=2
 nvram boot-ramdisk="/a/b/c/d/e/f/g/h/i/j/k/l/m/disk.dmg"
+sleep 1s
 
+dd of=/mnt2/iBEC if=/mnt1/iBoot bs=512k
+rm /mnt1/iBoot
 sleep 1s
 
 reboot_
diff --git a/resources/firmware/src/target/iphone5/11D257/exploit b/resources/firmware/src/target/iphone5/11D257/exploit
index aa222dd..5b56c95 100644
Binary files a/resources/firmware/src/target/iphone5/11D257/exploit and b/resources/firmware/src/target/iphone5/11D257/exploit differ
diff --git a/resources/firmware/src/target/iphone5/11D257/partition b/resources/firmware/src/target/iphone5/11D257/partition
index 3249e2f..59d593a 100644
--- a/resources/firmware/src/target/iphone5/11D257/partition
+++ b/resources/firmware/src/target/iphone5/11D257/partition
@@ -27,7 +27,6 @@ if [ -e "/ios8" ]; then
   sleep 1s
 fi
 
-
 if [ -e "/ios9" ]; then
   # step1
   mv -v /mnt1/System/Library/LaunchDaemons/* /mnt1/Library/LaunchDaemons/
@@ -54,33 +53,38 @@ System_LastSector="$((echo -e "i\n1\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null |
 Data_LastSector="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Last sector: //p' | sed 's/ .*//')"
 Data_Attributeflags="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*flags: //p')"
 Exploit_LastSector="$((524288/$LogicalSector))"
-New_Data_LastSector="$(($Data_LastSector-$Exploit_LastSector))"
+BOOTLOADER="$((8388608/$LogicalSector))"
+NOTSD="$(($Exploit_LastSector+$BOOTLOADER))"
+Data_LastSectorSD="$(($Data_LastSector-$BOOTLOADER))"
+New_Data_LastSector="$(($Data_LastSector-$NOTSD))"
 New_Data_SectorSize="$(($New_Data_LastSector-$System_LastSector))"
 New_Data_Size="$(($New_Data_SectorSize*$LogicalSector))"
 
 hfs_resize /mnt1/private/var $New_Data_Size
 sleep 1s
 
-if [ "$Data_Attributeflags" = "0001000000000000" ]; then
-echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
-else
-echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
-fi
-
+echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSectorSD\n\nn\n4\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
 sleep 1s
 
+sleep 1s
 newfs_hfs -s -v exploit /dev/rdisk0s1s3
+newfs_hfs -s -v bootloader /dev/rdisk0s1s4
 sleep 1s
 fsck_hfs -f /dev/rdisk0s1s3
+fsck_hfs -f /dev/rdisk0s1s4
 sleep 2s
 
 dd of=/dev/rdisk0s1s3 if=/exploit bs=512k count=1
 sleep 1s
+mount_hfs /dev/disk0s1s4 /mnt2
 
 nvram -c
 nvram boot-partition=2
 nvram boot-ramdisk="/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/disk.dmg"
+sleep 1s
 
+dd of=/mnt2/iBEC if=/mnt1/iBoot bs=512k
+rm /mnt1/iBoot
 sleep 1s
 
 reboot_
diff --git a/resources/firmware/src/target/iphone5b/11B554a/partition b/resources/firmware/src/target/iphone5b/11B554a/partition
index b6e20a7..e955fc6 100644
--- a/resources/firmware/src/target/iphone5b/11B554a/partition
+++ b/resources/firmware/src/target/iphone5b/11B554a/partition
@@ -27,7 +27,6 @@ if [ -e "/ios8" ]; then
   sleep 1s
 fi
 
-
 if [ -e "/ios9" ]; then
   # step1
   mv -v /mnt1/System/Library/LaunchDaemons/* /mnt1/Library/LaunchDaemons/
diff --git a/resources/firmware/src/target/iphone5b/11D257/exploit b/resources/firmware/src/target/iphone5b/11D257/exploit
index d4b3d7e..d7c79ac 100644
Binary files a/resources/firmware/src/target/iphone5b/11D257/exploit and b/resources/firmware/src/target/iphone5b/11D257/exploit differ
diff --git a/resources/firmware/src/target/iphone5b/11D257/partition b/resources/firmware/src/target/iphone5b/11D257/partition
index 3249e2f..59d593a 100644
--- a/resources/firmware/src/target/iphone5b/11D257/partition
+++ b/resources/firmware/src/target/iphone5b/11D257/partition
@@ -27,7 +27,6 @@ if [ -e "/ios8" ]; then
   sleep 1s
 fi
 
-
 if [ -e "/ios9" ]; then
   # step1
   mv -v /mnt1/System/Library/LaunchDaemons/* /mnt1/Library/LaunchDaemons/
@@ -54,33 +53,38 @@ System_LastSector="$((echo -e "i\n1\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null |
 Data_LastSector="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Last sector: //p' | sed 's/ .*//')"
 Data_Attributeflags="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*flags: //p')"
 Exploit_LastSector="$((524288/$LogicalSector))"
-New_Data_LastSector="$(($Data_LastSector-$Exploit_LastSector))"
+BOOTLOADER="$((8388608/$LogicalSector))"
+NOTSD="$(($Exploit_LastSector+$BOOTLOADER))"
+Data_LastSectorSD="$(($Data_LastSector-$BOOTLOADER))"
+New_Data_LastSector="$(($Data_LastSector-$NOTSD))"
 New_Data_SectorSize="$(($New_Data_LastSector-$System_LastSector))"
 New_Data_Size="$(($New_Data_SectorSize*$LogicalSector))"
 
 hfs_resize /mnt1/private/var $New_Data_Size
 sleep 1s
 
-if [ "$Data_Attributeflags" = "0001000000000000" ]; then
-echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
-else
-echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
-fi
-
+echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSectorSD\n\nn\n4\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
 sleep 1s
 
+sleep 1s
 newfs_hfs -s -v exploit /dev/rdisk0s1s3
+newfs_hfs -s -v bootloader /dev/rdisk0s1s4
 sleep 1s
 fsck_hfs -f /dev/rdisk0s1s3
+fsck_hfs -f /dev/rdisk0s1s4
 sleep 2s
 
 dd of=/dev/rdisk0s1s3 if=/exploit bs=512k count=1
 sleep 1s
+mount_hfs /dev/disk0s1s4 /mnt2
 
 nvram -c
 nvram boot-partition=2
 nvram boot-ramdisk="/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/disk.dmg"
+sleep 1s
 
+dd of=/mnt2/iBEC if=/mnt1/iBoot bs=512k
+rm /mnt1/iBoot
 sleep 1s
 
 reboot_
diff --git a/restore.sh b/restore.sh
index 26e181a..68dcce4 100755
--- a/restore.sh
+++ b/restore.sh
@@ -2449,7 +2449,7 @@ ipsw_prepare_powder() {
         fi
     fi
     local ExtraArgs2="--boot-partition"
-    if [[ $device_type == "iPhone5,3" || $device_type == "iPhone5,4" ]] && [[ $device_base_vers == "7.0"* ]]; then
+    if [[ $device_type == "iPhone5"* ]]; then
         # do this stuff because these use ramdiskH (jump to /boot/iBEC) instead of jump ibot to ibob
         if [[ $device_target_vers == "9"* ]]; then
             ExtraArgs2+="9"
@@ -3735,7 +3735,7 @@ menu_print_info() {
         warn "Activation records flag detected. Proceed with caution"
     fi
     if [[ -n $device_disable_bbupdate || $device_actrec == 1 ]]; then
-        print "* Stitching is supported in these restores/downgrades: 8.4.1/6.1.3, Other with SHSH (iOS 5+), powdersn0w"
+        print "* Stitching is supported in these restores/downgrades: 8.4.1/6.1.3, Other with SHSH, powdersn0w"
     fi
     if [[ -n $device_build ]]; then
         print "* iOS Version: $device_vers ($device_build)"