Sean's Edits, fixes #1