diff --git a/setup/autoformat.sh b/setup/autoformat.sh
index 47c8c94..20e7c41 100755
--- a/setup/autoformat.sh
+++ b/setup/autoformat.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+pacman -Sy parted
 echo "running lsblk..."
 lsblk
 echo "Press Enter Key to install; Ctrl+C to cancel if results are not as expected" 
@@ -8,27 +9,27 @@ read blockdevtemp
 blockdev = ""
 if [ "$blockdevtemp" != 'm' ]; then 
 
-	echo "Partitioning with default layout"
-	echo 'Layout: 4Gb efi partition \n       20Gb swap\n       Rest btrfs root'
-        (
-            
-        echo g
-        echo n
-        echo 1
+#	echo "Partitioning with default layout"
+#	echo 'Layout: 4Gb efi partition \n       20Gb swap\n       Rest btrfs root'
+    #    (
+    #        
+    #    echo g
+    #    echo n
+    #    echo 1
 
-        echo +4G
+    #    echo +4G
 
 
-        echo n
-        echo 2
+    #    echo n
+    #    echo 2
 
-        echo +20G
+    #    echo +20G
 
 
 
 
-        echo n
-        echo 3
+    #    echo n
+    #    echo 3
 
 
 
@@ -36,17 +37,26 @@ if [ "$blockdevtemp" != 'm' ]; then
 
 
 
-        echo w
+    #    echo w
 
 
-    ) | fdisk $blockdevtemp
+    #) | fdisk $blockdevtemp
     
+    parted --script $blockdevtemp \
+	mklabel gpt \
+	mkpart primary 1MiB 1GiB \
+	mkpart primary 1GiB 15GiB \
+	mkpart primary 100MiB 100% \
+	quit
     $blockdev=$blockdevtemp
+     
 fi
+ 
 
-if [ "$blockdev" == "" ]; then
+if [ "$blockdev" == "m" ]; then
     echo -n "Enter blockdev to install on: " 
     read blockdevnew
+    parted $blockdev
     $blockdev = $blockdevnew
 fi