Finished exercise 08, improved exercise 03