changed data loading method