Finish exercise 10.5