Implemented edit and save