Added ancillary data files, logic order changes