Implemented edit flow