Up to exercise 3.4