Initial edits for CSR