improved dry run