Added simple clustering