upgrades - S2 Architecture