diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index eaa1d170..b8322172 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -328,18 +328,16 @@ NODEUPDATE() {
 	declare -i cw; declare -i spc1; declare -i c
 	echo -e "${idsCL[LightGreen]}Updating All Nodes${idsCL[Default]}"
 	echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"
-	nmip=${NM_NODEMANAGER}
-	if [[ ${RUN_NODE_IP} == *"${nmip}"* ]]; then
-		nmip='localhost'
-	fi
+	
+	[ "${RUN_NODE_TYPE}" == "nm" ] && NMCMD="" || NMCMD="ssh -tq root@${NM_NODEMANAGER}"
 	
 	if [ "${2}" != "sync" ]; then
 		c=0; cw=24; spca=''; spc1=${cw}-7; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
 		echo -en "Updating Node-Manager[$nmip]${spca}  ~  ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : "
-		ssh -tq root@${nmip} "nodemgmt update q"
+		${NMCMD} "nodemgmt update q"
 		
 		# echo -en "  ~  ${idsCL[LightCyan]}LinUPx${idsCL[Default]} : "
-		# ssh -tq root@${nmip} "runup runup" >/dev/null 2>&1
+		# ${NMCMD} "runup runup" >/dev/null 2>&1
 		# echo -e "${idsCL[Green]}Updated${idsCL[Default]}"
 	fi
 	
@@ -361,7 +359,7 @@ NODEUPDATE() {
 				echo -en "  ~  ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : "
 				if ! ${NCMD} command -v nodemgmt > /dev/null; then
 				    ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1
-					ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
+					${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
 					echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}"
 				else
 				    ${NCMD} "nodemgmt update q"
@@ -376,15 +374,15 @@ NODEUPDATE() {
 				# echo -e "${idsCL[Green]}Updated${idsCL[Default]}"
 
 			else
-				nmdiv=$(ssh -tq root@${nmip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc  | cut -d ' ' -f 6)
-				nmsdc=$(ssh -tq root@${nmip} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf  | cut -d ' ' -f 6)
+				nmdiv=$(${NMCMD} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc  | cut -d ' ' -f 6)
+				nmsdc=$(${NMCMD} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf  | cut -d ' ' -f 6)
 				
 				echo -en "  ~  ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : "
 				if ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/defaults.local.inc ]] || 
 				ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ]] || 
 				[ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc  | cut -d ' ' -f 6) ] || 
 				[ ${nmsdc} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf  | cut -d ' ' -f 6) ]; then
-					ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
+					${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
 					echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Green]}Files Already Synced${idsCL[Default]}"