change some logic of loading data