timing

Fixing timing of events