#28 Remember cluster in the overlay