Design and performance upgrades