some changes for cluster solution