Making the watcher work better