CSP 3x mode roughly works now