Exercise 2 solved