First rewrites of watchdog