diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index b60e0eb9..c2fcf450 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -621,27 +621,27 @@ LISTCERTS(){
 		c=0; cw=26; spc=''
 		spc1=${cw}-${#SUBJECT}
 		until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-		if [ $DUEIN -gt $CERTEXPIRE ]; then
-			date="${idsST[Bold]}${idsCL[Red]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsST[Reset]}${idsCL[Default]}"
-		else
-			date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}"
-		fi
+		# if [ $DUEIN -gt $CERTEXPIRE ]; then
+		# 	date="${idsST[Bold]}${idsCL[Red]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsST[Reset]}${idsCL[Default]}"
+		# else
+		# 	date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}"
+		# fi
 		if [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ]; then
 			SUBJECT_DISP=${SUBJECT}
-		# else
-		# 	SUBJECT_DISP="${idsBG[Green]}${idsCL[White]}${SUBJECT}${idsBG[Default]}${idsCL[Cyan]}"
-		# 	spc="${idsBG[Green]}"
-		# 	until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-		# 	spc="${spc}${idsBG[Default]}${idsCL[Cyan]}"
+		else
+			SUBJECT_DISP="${idsBG[Green]}${idsCL[White]}${SUBJECT}${idsBG[Default]}${idsCL[Cyan]}"
+			spc="${idsBG[Green]}"
+			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+			spc="${spc}${idsBG[Default]}${idsCL[Cyan]}"
+		fi
+		if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then
+			echo -e "${idsCL[Cyan]}${SUBJECT_DISP}${spc}    ${date}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}"
+		elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then
+			echo -e "${idsCL[Cyan]}${SUBJECT_DISP}${spc}    ${date}    ${idsCL[Cyan]}${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}${idsCL[Default]}"
+			c=0; spc=''; until [ $c = ${cw} ]; do spc="${spc} "; c=`expr $c + 1`; done
+			echo -e "${idsCL[Cyan]}${spc}                  ${idsCL[Cyan]}${SUBJECT_NAMES[3]}, ${SUBJECT_NAMES[4]}, ${SUBJECT_NAMES[5]}${idsCL[Default]}"
+
 		fi
-		# if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then
-		# 	echo -e "${idsCL[Cyan]}${SUBJECT_DISP}${spc}    ${date}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}"
-		# elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then
-		# 	echo -e "${idsCL[Cyan]}${SUBJECT_DISP}${spc}    ${date}    ${idsCL[Cyan]}${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}${idsCL[Default]}"
-		# 	c=0; spc=''; until [ $c = ${cw} ]; do spc="${spc} "; c=`expr $c + 1`; done
-		# 	echo -e "${idsCL[Cyan]}${spc}                  ${idsCL[Cyan]}${SUBJECT_NAMES[3]}, ${SUBJECT_NAMES[4]}, ${SUBJECT_NAMES[5]}${idsCL[Default]}"
-		#
-		# fi
 		DIVIDER false darkGray 100
 	done
 	echo