replaced all usages of watchdog()