History upgrade changes...