more work on badges