Finish exercise 1.8