edited lines 29-30, 45-46
changes from edits branch applied
resolved conflicts
Merge branch 'nextpass'

Merging edits made by the team.