SSP-944 more changes