Updated for new format of input file