working on the edit