Update to use badges