Changed heatmap performance