adjusted the event class a little