Improved heuristic
With heuristic changes