Updated Watchdog