Upgrade to match new Events
Merge pull request #1 from Parcela/upgrade-working-new-events

Upgrade to match new Events