some changes to load data in steps