Exercise 3, fixed exercise 2