Finish exercise 2.1