Updated exercise 1