Removed calculate_bounding_box and merged parts of it into update_bounding_box