generalised, heatmap added, fixed directories