Finalization of changes for Iteration 3