Changes for new data file and fixes for his format
Changes for new data file and fixes for his format