enhancement due to learnings from first complete run