Watch modification & small changes