added clustering - untested
removed export