Some useful changes to the watcher