2nd attempt at eliminating borders.