Fixed Border checking. Working.