Changes to #6
Changes to #6
Changes to #6
Changes to #6
Fixed #6
Formatting