change from CsvMapper to CSV functions