Iteration 6 Changes