modified data loading