With new logic for reading in flat files