Changes to exercise 6