updated call to events
Merge branch 'develop'