Updated exercise 4.1