Updated parser and CSVfile.