Finished exercise 2.1