tweak data file and parsing
new version