speedup  the clustering macros close #93