some changes to model loading