Finish exercise 3.5 1