Final changes before submitting iteration 2