exercise 2 updated