Process early event properly
Merge branch 'EarlyEvents'