Updated exercise 4.5