borders rework (start)