Update to border file and base