More edits for SSP