changed the logic of saving. Added a dedicated button for that