Done: simpler approach to the border issue