More work on updating