Updated Watcher