Reagroup client code