Watcher enhanced