Move the event broadcast to occur at the times they should
Merge branch 'change-event-moment'