diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index d0ddf1d9..3c678ab7 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1186,46 +1186,60 @@ DELSITE(){
 		echo -e -n "${idsCL[LightRed]}Do you also want to delete the certs for '${DEL_SITE}' as well? [y/N]${idsCL[Default]} "
 		read DEL_SSL
 	fi
-	if [ ! -z ${DEL_SITE+x} ] && [ "${DEL_SITE}" != "" ]; then
+	if [ ! -z ${DEL_SITE+x} ] && [ "${DEL_SITE}" != "" ]; then		
 		echo -e "${idsCL[LightRed]}Deleting site '${idsCL[Red]}${DEL_SITE^^}${idsCL[LightRed]}'...${idsCL[Default]}"
 		echo ""
 	
 		echo -e "${idsCL[LightRed]}[[Removing Files and Folders]]${idsCL[Default]}"
 		echo -e "${idsCL[LightRed]}-------------------------------------------${idsCL[Default]}"
-
-		nid=1
-		for nip in "${WEB_HOSTS[@]}"; do
-			if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
-				nip='localhost '
-				NCMD=''
-			else
-				NCMD="ssh root@${nip}"
-			fi
-			echo -en "Removing from Webserver-Node${nid} ($nip)... ${idsCL[Default]}"
-			if [ "${NCMD}" != "" ]; then
-				checkhost=$(CHECK_HOST ${nip})
-			fi
-			if [ "${checkhost}" != "false" ]; then
-				#if [ -f /etc/nginx/sites-available/${DEL_SITE} ]; then
-					${NCMD} rm -f /etc/nginx/sites-available/${DEL_SITE}*
-					${NCMD} rm -f /etc/nginx/sites-enabled/${DEL_SITE}*
-					#fi
-				#if [ -d /var/www/${DEL_SITE} ]; then
-					${NCMD} rm -rf /var/www/${DEL_SITE}
-					#fi
-				if [ "${DEL_SSL}" = "yes" ]; then
-					${NCMD} rm -rf /etc/letsencrypt/archive/${DEL_SITE}
-					${NCMD} rm -rf /etc/letsencrypt/live/${DEL_SITE}
-					${NCMD} rm -f /etc/letsencrypt/renewal/${DEL_SITE}.conf
-				fi
-				echo -e "${idsCL[Green]}OK${idsCL[Default]}"
-			else
-				echo -e "${idsCL[Red]}Node is down${idsCL[Default]}"
-			fi
-			nid=`expr $nid + 1`
-		done
-		echo ""
-		SERVICE nginx reload ns
+		echo
+		echo -en "${idsCL[LightCyan]}Removing files from all Nodes ... ${idsCL[Default]}"
+		ssh root@10.10.1.120 rm -f /etc/nginx/sites-enabled/${DEL_SITE}* >/dev/null 2>&1
+		ssh root@10.10.10.80 rm -f /etc/nginx/sites-enabled/${DEL_SITE}* >/dev/null 2>&1
+		if [ "${DEL_SSL}" == "yes" ]; then
+			ssh root@10.10.10.80 rm -rf /etc/letsencrypt/archive/${DEL_SITE} >/dev/null 2>&1
+			ssh root@10.10.10.80 rm -rf /etc/letsencrypt/live/${DEL_SITE} >/dev/null 2>&1
+			ssh root@10.10.10.80 rm -f /etc/letsencrypt/renewal/${DEL_SITE}.conf >/dev/null 2>&1
+		fi
+		echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+		echo
+		echo -en "${idsCL[LightCyan]}Reloading NGINX ... ${idsCL[Default]}"
+		SERVICE nginx reload >/dev/null 2>&1
+		echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+		
+		# nid=1
+		# for nip in "${WEB_HOSTS[@]}"; do
+		# 	if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
+		# 		nip='localhost '
+		# 		NCMD=''
+		# 	else
+		# 		NCMD="ssh root@${nip}"
+		# 	fi
+		# 	echo -en "Removing from Webserver-Node${nid} ($nip)... ${idsCL[Default]}"
+		# 	if [ "${NCMD}" != "" ]; then
+		# 		checkhost=$(CHECK_HOST ${nip})
+		# 	fi
+		# 	if [ "${checkhost}" != "false" ]; then
+		# 		#if [ -f /etc/nginx/sites-available/${DEL_SITE} ]; then
+		# 			${NCMD} rm -f /etc/nginx/sites-available/${DEL_SITE}*
+		# 			${NCMD} rm -f /etc/nginx/sites-enabled/${DEL_SITE}*
+		# 			#fi
+		# 		#if [ -d /var/www/${DEL_SITE} ]; then
+		# 			${NCMD} rm -rf /var/www/${DEL_SITE}
+		# 			#fi
+		# 		if [ "${DEL_SSL}" = "yes" ]; then
+		# 			${NCMD} rm -rf /etc/letsencrypt/archive/${DEL_SITE}
+		# 			${NCMD} rm -rf /etc/letsencrypt/live/${DEL_SITE}
+		# 			${NCMD} rm -f /etc/letsencrypt/renewal/${DEL_SITE}.conf
+		# 		fi
+		# 		echo -e "${idsCL[Green]}OK${idsCL[Default]}"
+		# 	else
+		# 		echo -e "${idsCL[Red]}Node is down${idsCL[Default]}"
+		# 	fi
+		# 	nid=`expr $nid + 1`
+		# done
+		# echo ""
+		# SERVICE nginx reload ns
 		echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}"
 	else
 		echo "Missing arguments"
@@ -1892,37 +1906,42 @@ SERVICE(){
 		fi
 		
 	else
-		IP=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
-		for NTYPE in "${NODE_TYPES[@]}"; do
-			var=${NTYPE}_HOSTS[@]
-			for nip in "${!var}"; do
-				if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
-					NODE_TYPE=${NTYPE};
-					break 2
-				fi
+		if [ "${3}" != "all" ]; then
+			IP=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
+			for NTYPE in "${NODE_TYPES[@]}"; do
+				var=${NTYPE}_HOSTS[@]
+				for nip in "${!var}"; do
+					if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
+						NODE_TYPE=${NTYPE};
+						break 2
+					fi
+				done
 			done
-		done
-		if [ "$NODE_TYPE" = "NC" ]; then
-			NT_HOSTS=NC_HOSTS[@]
-			NT_HOST=NC_HOSTS[0]
-			NTS=('NC'); #NTS=$NTS1[@]
-		elif [ "$NODE_TYPE" = "LB" ]; then
-			NT_HOSTS=LB_HOSTS[@]
-			NT_HOST=LB_HOSTS[0]
-			NTS=('LB'); #NTS=$NTS1[@]
-		elif [ "$NODE_TYPE" = "WEB" ]; then
-			NT_HOSTS=WEB_HOSTS[@]
-			NT_HOST=WEB_HOSTS[0]
-			NTS=('WEB'); #NTS=$NTS1[@]
-		elif [ "$NODE_TYPE" = "MYSQL" ]; then
-			NT_HOSTS=MYSQL_HOSTS[@]
-			NT_HOST=MYSQL_HOSTS[0]
-			NTS=('MYSQL'); #NTS=$NTS1[@]
-		elif [ "${1}" = "nginx" ]; then
-			NT_HOSTS=WEB_HOSTS[@]
-			NT_HOST=WEB_HOSTS[0]
-			NTS=('WEB'); #NTS=NTS1[@]
-			# NTS=$NODE_TYPES
+			if [ "$NODE_TYPE" = "NC" ]; then
+				NT_HOSTS=NC_HOSTS[@]
+				NT_HOST=NC_HOSTS[0]
+				NTS=('NC'); #NTS=$NTS1[@]
+			elif [ "$NODE_TYPE" = "LB" ]; then
+				NT_HOSTS=LB_HOSTS[@]
+				NT_HOST=LB_HOSTS[0]
+				NTS=('LB'); #NTS=$NTS1[@]
+			elif [ "$NODE_TYPE" = "WEB" ]; then
+				NT_HOSTS=WEB_HOSTS[@]
+				NT_HOST=WEB_HOSTS[0]
+				NTS=('WEB'); #NTS=$NTS1[@]
+			elif [ "$NODE_TYPE" = "MYSQL" ]; then
+				NT_HOSTS=MYSQL_HOSTS[@]
+				NT_HOST=MYSQL_HOSTS[0]
+				NTS=('MYSQL'); #NTS=$NTS1[@]
+			elif [ "${1}" = "nginx" ]; then
+				NT_HOSTS=WEB_HOSTS[@]
+				NT_HOST=WEB_HOSTS[0]
+				NTS=('WEB'); #NTS=NTS1[@]
+				# NTS=$NODE_TYPES
+			else
+				NTS=(${NODE_TYPES[*]})
+			fi
+			
 		else
 			NTS=(${NODE_TYPES[*]})
 		fi