Change save, update logics