updated CSVParser - need to test