Final changes for iteration 1