Some minor changes to the new version.