exercise 1 2 updated