Updated EventDispatcher, and NEXT lib.