Update Exercise 15.36.r