Latest changes on watchDog