refactoring partial loading