Work on edit functionality