Added Badges
New Calculation for Badges and sending notification thereafter