Added the refactored watchdog back