more upgrades, broken at hinf step