Finish exercise 2.20