diff --git a/resources/device.sh b/resources/device.sh
index e770d62..c5fcf94 100755
--- a/resources/device.sh
+++ b/resources/device.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+DisableBBUpdate="iPad2,3" # Disable baseband update for this device. You can also change this to your device if needed
+
 FindDevice() {
     local DeviceIn
     local i=0
diff --git a/resources/downgrade.sh b/resources/downgrade.sh
index 0b6a462..a17426a 100755
--- a/resources/downgrade.sh
+++ b/resources/downgrade.sh
@@ -190,7 +190,7 @@ DowngradeOTA() {
     SaveOTABlobs
     IPSWFindVerify
     kDFU
-    if [[ $Jailbreak == 1 || $ProductType == "iPad2,3" ]]; then
+    if [[ $Jailbreak == 1 || $ProductType == "$DisableBBUpdate" ]]; then
         IPSW32
     else
         IPSWCustom=0
diff --git a/resources/ipsw.sh b/resources/ipsw.sh
index eee5bb5..45fff28 100755
--- a/resources/ipsw.sh
+++ b/resources/ipsw.sh
@@ -22,13 +22,13 @@ JailbreakSet() {
          [[ $OSVer == "8.4.1" ]] && JBDaibutsu=1
     fi
 
-    [[ $platform == "win" ]] && IPSWCustom="${IPSWCustom}JB"
+    [[ $platform == "win" ]] && IPSWCustom+="JB"
     if [[ $JBDaibutsu == 1 ]]; then
         JBName="daibutsu"
-        IPSWCustom="${IPSWCustom}D"
+        IPSWCustom+="D"
     elif [[ $OSVer == "8.4.1" ]]; then
         JBName="EtasonJB"
-        IPSWCustom="${IPSWCustom}E"
+        IPSWCustom+="E"
     elif [[ $OSVer == "7.1.2" ]]; then
         JBName="Pangu7"
     elif [[ $OSVer == "6"* && $ProductType == "iPhone3"* ]]; then
@@ -67,7 +67,13 @@ JailbreakOption() {
     if [[ $ProductType == "iPhone3"* ]]; then
         [[ $Jailbreak == 1 ]] && Custom="Custom" || Custom="CustomN"
         IPSWCustom="${ProductType}_${OSVer}_${BuildVer}_${Custom}"
-        [[ $OSVer == 4.3* ]] && IPSWCustom="$IPSWCustom-$UniqueChipID"
+        [[ $OSVer == 4.3* ]] && IPSWCustom+="-$UniqueChipID"
+    elif [[ $ProductType == "$DisableBBUpdate" ]]; then
+        Log "Baseband update will be disabled for the custom IPSW."
+        IPSWCustom+="B"
+        if [[ $platform != "win" && $Jailbreak != 1 ]]; then
+            IPSWCustom+="N"
+        fi
     fi
     echo
 
@@ -75,7 +81,7 @@ JailbreakOption() {
     if [[ $Jailbreak != 1 ]]; then
         if [[ $ProductType == "iPhone3"* ]]; then
             [[ $OSVer == "7.1.2" ]] && return
-        else
+        elif [[ $ProductType != "$DisableBBUpdate" ]]; then
             return
         fi
     fi
@@ -213,13 +219,10 @@ IPSW32() {
             JBFiles[$i]=../resources/jailbreak/${JBFiles[$i]}
         done
     fi
+    [[ $ProductType == "$DisableBBUpdate" ]] && BBUpdate=
     if [[ $platform == "win" ]]; then
         BBUpdate=
         WinBundles="windows/"
-    elif [[ $ProductType == "iPad2,3" ]]; then
-        BBUpdate=
-        [[ $Jailbreak != 1 ]] && IPSWCustom+="N"
-        IPSWCustom+="B"
     fi
 
     if [[ ! -e $IPSWCustom.ipsw ]]; then
diff --git a/restore.sh b/restore.sh
index a388d3d..294b0ef 100755
--- a/restore.sh
+++ b/restore.sh
@@ -31,7 +31,7 @@ if [[ $NoColor != 1 ]]; then
 fi
 
 Clean() {
-    rm -rf iP*/ shsh/ tmp/ *.im4p *.bbfw BuildManifest.plist version.xml
+    rm -rf iP*/ shsh/ tmp/ *.im4p *.bbfw *.plist *.tmp version.xml
     kill $iproxyPID $ServerPID 2>/dev/null
 }
 
@@ -181,7 +181,7 @@ Main() {
             if [[ $DeviceProc == 4 && $OSVer == "7.1.2" ]]; then
                 Log "Creating custom IPSW is not needed for non-jailbroken 7.1.2 restores."
                 ExitWin 0
-            elif [[ $ProductType != "iPhone3"* && $ProductType != "iPad2,3" ]]; then
+            elif [[ $ProductType != "iPhone3"* && $ProductType != "$DisableBBUpdate" ]]; then
                 Log "Creating custom IPSW is not needed for non-jailbroken restores on your device."
                 ExitWin 0
             fi