Enabled WatchDog and Made toggling smarter