ClusterMap2Part2 first commit