Updated after final patch to SSP