improve cluster bootstrap