Updated borders to work better with CA treatment and non-treatment.