Switching from rechits to clusters