Updated exercise 16 with additional solution