reworking of watchdog