Changed badge event names
refactored hooks
refactored hooks