more parsing, changed input file