More cell types, adding heatmap with clustering