Condensed driver; fixed heatmap code