Updated Exercise 7.1