Cluster and fig done properly