Updated Exercise 2