Changes to update functionality