CSP 1.1: First pass at updated WD.