Address review comment related to where "border" goes