minor changes in the watcher