Changes to demos to use new event type