Part 2/4 for issue #2.