a bit of editing