A few modifications with events.