New clustering logic v.2