Excercise 17, version 2