Added checking against overlap, 4 tests still failing.