Exercise 6 update