Update Exercise 15.22.r