Move operations around so it would make more sense for the watcher... Still not perfect