many updates to the CSP and SSP