Added a custom watcher because the built-in one doesn't work