[enh] Better heatled