before branching to add legacy clustering