Working more on heatmap