moved firing of events