first pass of edits / scenario 1