Fixes #3 Part 3