Chnages for new BadgesPlus 1.5