Improved for watchdog