add events flash
Merge branch 'dev'