mark's full edits pass 1