moved eventdispatcher into system