Finalized version with heat map