added --dry_run option