Updates from exercise 2