Updated Heatmap Application