More work on the update