Finish things for exercise 3