Finished update and edit