fixed save and update