Updated exercise 1 & 2