Another rewrite of editing