Pre bounding box making refactoring.