iteration 2 final changes