Updated exercise 13-6