Last minute changes before Iteration 3-2