Another refactor to enable a new center point.