More changes for update method.