Contamination and heatmap improved