Update Exercise 15.07.r