improved watcher + binary