work on edit