new changes with clustering