some changes to make for a better load process