implement and test new CSP
fix merge conflict