New changes and HeatMap added.