Removed unessecary isBorder() method (to be replaced with something better)