Edits from Matt M and Nathan A