attempting huge change to edit and save