Chapter 12 challente refactored.
Correct commit.