Modified update method