More copy/logic upgrades.