- border check fixed and functional