edits from previous pull request