Update Exercise 15.21.r