Update for Exercise 2 and 9