mayyybe fixed looping + heuristics issue