dry_run improved