Modify to conform to the new CSR.