improve "with" script
improve "with" script