Changes from iteration 2