Changes in structure to pass CSP control.