Rehaul of scripts due to input file format change