Iteration on setup wiz