Simplified custom events.
Updated demo with new events
no message