more changes to clusterer