Slowly applying the heuristics on the tuning branch.