Quick comment on changes
Add some custom events and use them.