Fix spec
Convert all trigger calls to dispatch calls
Call new event methods