Up to exercise 3.5