diff --git a/products/slim_vibrantmtd.mk b/products/slim_vibrantmtd.mk
index a67f8ee..6ed1859 100644
--- a/products/slim_vibrantmtd.mk
+++ b/products/slim_vibrantmtd.mk
@@ -17,8 +17,8 @@
 PRODUCT_DEVICE := vibrantmtd
 PRODUCT_NAME := slim_vibrantmtd
 PRODUCT_BRAND := samsung
-PRODUCT_MODEL := GT-I9000
+PRODUCT_MODEL :=SGH-T959
 
 #Set build fingerprint / ID / Prduct Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9000 TARGET_DEVICE=GT-I9000 BUILD_FINGERPRINT=samsung/GT-I9000/GT-I9000:4.1.1 JRO03L eng.ar.20120828.084310 release-keys 
-PRIVATE_BUILD_DESC="GT-I9000-userdebug 4.1.1 JRO03L eng.ar.20120828.084310 release-keys"
\ No newline at end of file
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-T959 TARGET_DEVICE=SGH-T959 BUILD_FINGERPRINT="samsung/SGH-T-959/GT-I9000:4.1.1 JRO03L eng.ar.20120828.084310 release-keys" 
+PRIVATE_BUILD_DESC="GT-I9000-userdebug 4.1.1 JRO03L eng.ar.20120828.084310 release-keys"
diff --git a/tools/squisher b/tools/squisher
index 89b73ee..ec60f63 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -124,11 +124,17 @@
 	find $REPACK/ota/system/lib/modules -name "*.ko" -print0 | xargs -0 arm-eabi-strip --strip-unneeded
 
 # Swap boot.img
-#DEVICEINFO=`sed -n -e'/ro\.product\.device/s/^.*=//p' $REPACK/ota/system/build.prop`
-#if [ "$DEVICEINFO" = "GT-I9000" ]; then
+DEVICEINFO=`sed -n -e'/ro\.product\.device/s/^.*=//p' $REPACK/ota/system/build.prop`
+if [ "$DEVICEINFO" = "maguro" ]; then
+	printf "Don't Mess with Maguro boot.img"
+elif [ "$DEVICEINFO" = "toroplus" ]; then
+	printf "Don't Mess with ToroPlus boot.img"
+elif [ "$DEVICEINFO" = "toro" ]; then
+	printf "Don't Mess with Toro boot.img"
+else
    rm -f $REPACK/ota/boot.img
    mv -f $REPACK/ota/system/slimkernel/boot.img $REPACK/ota/boot.img
-#fi
+fi
 
 # Determine what to name the new signed package
 MODVERSION=`sed -n -e'/ro\.modversion/s/^.*=//p' $REPACK/ota/system/build.prop`