Improving watchdog