CSP changes batch 2