More work on new Update structure.