More watcher work