diff --git a/defaults.inc b/defaults.inc
index d7435426..ccac8daf 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.16.14-11292023'
+VERS='4.16.16-11292023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/inc/status.inc b/inc/status.inc
index 3c8de065..308b2c6e 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -214,14 +214,21 @@ STATUS(){
 							[ "${NTYPE}" != "OFW" ] && srvctst=(`${NCMD} "systemctl is-active ${srvcstotest}"`)
 							sr=0
 							for srvc in "${!srvcs}"; do
-								if [ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then
-									NOGOCHK=false
-									rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
+								tmp=${NM_SINGLESRVR_SERVICES[${NTYPE}]}
+								if [[ ${tmp[@]} =~ ${srvc} ]]; then
+									if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NTYPE}]}* ]]; then
+										SSCHK=false
+										rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
+									else
+										SSCHK=true
+									fi
 								else
-									NOGOCHK=true
+									SSCHK=true
 								fi
+								
 								[ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]) && NOGOCHK=false
-								if [ ${NOGOCHK} == true ]; then
+								
+								if [ ${SSCHK} == true ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
 										if [ "${ST_ACTION}" != "report" ]; then
 											c=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
@@ -303,31 +310,16 @@ STATUS(){
 							for docker in "${!dockers}"; do
 								tmp=${NM_SINGLESRVR_DOCKERS[${NTYPE}]}
 								if [[ ${tmp[@]} =~ ${docker} ]]; then
-									if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then
-										echo "not primary - $nip - $docker"
-									else
-										echo "docker found - $nip - $docker"
-									fi
-								fi								
-								if [ "${NTYPE}" == "WEB" ]; then
-									if ([ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ]) && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then
-										NOGOCHK=false
+									if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NTYPE}]}* ]]; then
+										SSDCHK=false
 										rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 									else
-										NOGOCHK=true
-									fi
-								elif [ "${NTYPE}" == "LB" ]; then
-
-									if [ "${docker}" == "authelia" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['LB']}* ]]; then
-										NOGOCHK=false
-										rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
-									else
-										NOGOCHK=true
+										SSDCHK=true
 									fi
 								else
-									NOGOCHK=true
+									SSDCHK=true
 								fi
-								if [ ${NOGOCHK} == true ]; then
+								if [ ${SSDCHK} == true ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
 										if [ "${ST_ACTION}" != "report" ]; then
 											c=0; cw=${PRI_CW}; spc=''