Working on the watcher