Updated watchdog