Exercise 6 updates