Added new heatmap code