Fixes #3 Part 6