Update Exercise 2.18