Order of firing events

Blocks #2525