rearranged events
Merge branch 'development'