Moves  updating into beforeSave().