Improved CSR editting