minor changes according to update method