Updated Watcher to start functioning properly