Clarify intention.
Add event builder.
Change to use event builder.
Fix method definition.