changes to heuristcs, untested