Watchdog implementation
required changes