Now handling new format of data file.