revise on the edit part