Updated exercise 2