reorganized for cluster