More general editing with Dave's edits as well