partial work on second edits

as above