Updated exercise 4-4