updated data loading