Some more updates to the watcher