Added watcher logic