Changes for Iteration 2