v3: integrating watcher; not tested