updates to data loading