More work on the updater