Added a bit of editing functionality