Updated exercise 3