Simplified logic for watcher