change the Data loading logic