Exercise 2 modified