lazy loading is still here. it was the goal of the refactoring to get rid of duplicate code.