Updates to invalidity heuristic (test run 1)