Rework update method