working on edit flow