lots of SSP changes