Exercise 3.2 updates