Exercise 2 fix and Exercise 3