datafile parsing updated