diff --git a/scripts/0-install.sh b/scripts/0-install.sh
index 6ffed4c..fef3c09 100644
--- a/scripts/0-install.sh
+++ b/scripts/0-install.sh
@@ -4,29 +4,39 @@ echo "Building initial system"
 lsblk
 read -p 'Please enter the drive value for the root partition, this partition will be wiped and formatted: ' rootpar
 read -p 'Please enter the drive value for the EFI partition: ' efipar
-read -p 'Please enter the drive value for the home partition: ' homepar
 # Format the root partition to ext4
 mkfs.ext4 /dev/$rootpar
 # Mount root partition
 mount /dev/$rootpar /mnt
 # Run pacstrap and install base packages
 pacstrap -i /mnt base base-devel linux linux-firmware linux-headers intel-ucode git openssh rsync networkmanager grub efibootmgr dosfstools os-prober nano dkms dbus-broker-units mkinitcpio iptables-nft 
-# Create the /boot/efi directory and mount the EFI partition to it
-mkdir /mnt/boot/efi
-mount /dev/$efipar /mnt/boot/efi
-# Ask if the home partition should be wiped before mounting
-read -p "Do you wish to wipe the home partition? " yesno
+# Ask if the EFI partition should be wiped before mounting
+read -p "Do you wish to wipe the EFI partition? If you already have an existing OS installed, say No. " yesno
 case $yesno in
     [yesYesYy]* ) 
-        mkfs.ext4 /dev/$homepar
+        mkfs.fat -F32 /dev/$efipar
     ;;
     [noNoNn]* ) 
-        echo "The home partition will not be wiped"
+        echo "The EFI partition will not be wiped"
+    ;;
+    * ) echo "Please answer yes (Yes, y, Y) or no (No, n, N)";;
+esac
+# Create the /boot/efi directory and mount the EFI partition to it
+mkdir /mnt/boot/efi
+mount /dev/$efipar /mnt/boot/efi
+# Ask if a home partition should be created
+read -p "Do you wish to set a home partition? " yesno
+case $yesno in
+    [yesYesYy]* )
+        read -p 'Please enter the drive value for the home partition: ' homepar 
+        mkfs.ext4 /dev/$homepar
+        mount /dev/$homepar /mnt/home
+    ;;
+    [noNoNn]* ) 
+        echo "A home partition will not be used in this installation"
     ;;
     * ) echo "Please answer yes (Yes, y, Y) or no (No, n, N)";;
 esac
-# Mount the home partition
-mount /dev/$homepar /mnt/home
 # Generate a fstab file
 genfstab -U /mnt >> /mnt/etc/fstab
 # Copy system config files into the new install