diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 1325dd3d..6c176d80 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -373,6 +373,7 @@ else
       fi
 
       # final Options
+      OPTIONS+=(HARDWARE "Run Hardwaretest")   
       OPTIONS+=(OFF "PowerOff RaspiBlitz")   
       OPTIONS+=(X "Console / Terminal")
 
@@ -517,6 +518,10 @@ case $CHOICE in
               ./00mainMenu.sh
             fi
             ;;
+        HARDWARE)
+            sudo ./05hardwareTest.sh
+            ./00mainMenu.sh
+            ;;
         PASSWORD)
             sudo /home/admin/config.scripts/blitz.setpassword.sh
             noreboot=$?
diff --git a/home.admin/05hardwareTest.sh b/home.admin/05hardwareTest.sh
index 07a2e08f..9308a057 100755
--- a/home.admin/05hardwareTest.sh
+++ b/home.admin/05hardwareTest.sh
@@ -9,6 +9,7 @@
 # INFOFILE - state data from bootstrap
 source /home/admin/raspiblitz.info
 
+clear
 echo "*** Hardware Test Report ***"
 echo ""
 
diff --git a/home.admin/XXdebugLogs.sh b/home.admin/XXdebugLogs.sh
index 55bf40d4..718b32cb 100644
--- a/home.admin/XXdebugLogs.sh
+++ b/home.admin/XXdebugLogs.sh
@@ -75,8 +75,25 @@ fi
 echo ""
 
 echo "*** HARDWARE TEST RESULTS ***"
-echo "UndervoltageReports in Logs: ${undervoltageReports}"
+showImproveInfo=0
+if [ ${#undervoltageReports} -gt 0 ]; then
+  echo "UndervoltageReports in Logs: ${undervoltageReports}"
+  if [ ${undervoltageReports} -gt 0 ]; then
+    showImproveInfo=1
+  fi
+fi
 if [ -f /home/admin/stresstest.report ]; then
   sudo cat /home/admin/stresstest.report
+  source /home/admin/stresstest.report
+  if [ ${powerWARN} -gt 0 ]; then
+      showImproveInfo=1
+  fi
+  if [ ${tempWARN} -gt 0 ]; then
+      showImproveInfo=1
+  fi
+fi
+if [ ${showImproveInfo} -gt 0 ]; then
+  echo "IMPORTANT: There are some hardware issues with your setup."
+  echo "'Run Hardwaretest' in main menu or: sudo /home/admin/05hardwareTest.sh"
 fi
 echo ""
\ No newline at end of file