Simplified code and got watcher working