Final changes for iteration 2