Major Update on CSV changes