diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh
index 829037e..d0652fe 100755
--- a/archinstall/archinstall.sh
+++ b/archinstall/archinstall.sh
@@ -244,9 +244,19 @@ if [[ $partefi ]];then
 mkdir -p /mnt/boot/efi
 mount /dev/$partefi /mnt/boot/efi/
 fi
+
+wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O /tmp/pacman.conf
+if [[ $? != 0 ]];then
+fatalerror "$(T "Network connection error, please check it")"
+fi
+tput setaf 2 ; echo "$(T "Optimizing download")" ; tput setaf 9
+reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
+tput setaf 2 ; echo "$(T "Downloading")" ; tput setaf 9
+pacstrap -C /tmp/pacman.conf /mnt/ base btrfs-progs
 #Create fstab
 genfstab -U /mnt >> /mnt/etc/fstab
-#Create or activate swap
+
+#Create or activate swap if neccesary
 if [[ $swaptype ]];then
 	case $swaptype in
 		1)
@@ -259,14 +269,6 @@ if [[ $swaptype ]];then
 	esac
 fi
 
-wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O /tmp/pacman.conf
-if [[ $? != 0 ]];then
-fatalerror "$(T "Network connection error, please check it")"
-fi
-tput setaf 2 ; echo "$(T "Optimizing download")" ; tput setaf 9
-reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
-tput setaf 2 ; echo "$(T "Downloading")" ; tput setaf 9
-pacstrap -C /tmp/pacman.conf /mnt/ base btrfs-progs
 mkdir -p /mnt/root/inst/
 wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/chrootinstall.sh -O /mnt/root/inst/chrootinstall.sh
 if [[ $? != 0 ]];then