Comparison upgrades, handle form and fitness