Exercise 4 updates