Staged move to new friends infrastructure