1. changed the do until to do while 2. respected dry/wet run params