diff --git a/gentoo-gnome.sh b/gentoo-gnome.sh
index eaed719..fc56c54 100644
--- a/gentoo-gnome.sh
+++ b/gentoo-gnome.sh
@@ -469,10 +469,9 @@ initialize-disk() {
 	parted /dev/$HARD_DISK mklabel gpt
 	parted -a optimal /dev/$HARD_DISK mkpart primary fat32 1MiB 200MiB
 	parted -a optimal /dev/$HARD_DISK mkpart root ext3 200MiB ${ROOT_PARTITION_SIZE}GB
-	sleep 5
 	parted -a optimal /dev/$HARD_DISK set 1 esp on
-	parted -a optimal /dev/$HARD_DISK mkpart swap ext3 ${ROOT_PARTITION_SIZE}GB $SWAP_SIZE_END
-	parted -a optimal /dev/$HARD_DISK mkpart home ext3 $SWAP_SIZE 100%
+	parted -a optimal /dev/$HARD_DISK mkpart swap ext3 ${ROOT_PARTITION_SIZE}GB ${SWAP_SIZE_END}GB
+	parted -a optimal /dev/$HARD_DISK mkpart home ext3 ${SWAP_SIZE_END}GB 100%
 	partitionDetection
 	echo
 	echo "Formatting....."