Exercise 2.8 correctly modified