diff --git a/setup.sh b/setup.sh
index 2773db6..531179d 100644
--- a/setup.sh
+++ b/setup.sh
@@ -11,7 +11,7 @@ echo "Working in '$DIR'."
 
 
 skip="false"
-if [[ "$1" == "skip" || "$2" == "skip" || "$3" == "skip" ]]; then
+if [[ "$@" == *"skip"* || "$@" == *"-s"* ]]; then
 	skip="true"
 fi
 
@@ -40,16 +40,12 @@ else
 fi
 
 
-if [[ "$skip" == "true" ]]; then
-	echo -e "\n`date` - Skipping Installs"
-else
-	echo -e "\n`date` - Install Software"
-	pkg install -y \
-		openssh tsu vim htop git cronie man zip ncurses-utils \
-		nmap traceroute wget rsync \
-		ffmpeg imagemagick \
-		kotlin php nodejs python libllvm hugo
-fi
+echo -e "\n`date` - Install & Updayte Crtical Software"
+pkg install -y \
+	openssh tsu vim htop git cronie man zip ncurses-utils \
+	nmap traceroute wget rsync \
+	ffmpeg imagemagick \
+	kotlin php nodejs python libllvm hugo
 
 
 echo -e "\n`date` - BASH Environment"