Part 2/5 for issue #9