Upgraded CSPOM