Ben's 2nd pull request — header changes