started working on edit