More work on update method