Exercise 2 updates