More work on the updater again...