improved watchdog