major changes to data loading