integrated the heatmap and web branches