HeatMap still being fixed