change way to load data