Code merged with Lavannya's code MAIN-CSR-merge