Rewrite using large-watcher module