some changes for save