Extra updates to exercise 3