Finish exercise 2.2