changes in badge handling