Update to Exercise 5.8