refactor object loading, part 1
refactor object loading, part 2