Changes to input file reader