Updated exercise 1 and 2