Updated for latest watchdog