More changes to the CSP