Improve watcher.