Updated watcher