Oh, we should use the new badges too