Rework edit method