working on edit