Adding watchdog suggestions from PVG