Further improve the CSP