Modify events and examples
Merge pull request #3662 from nutty898/#4558

Modify events and examples