Event-handling system added