removed auto save on DWS and added save button