add flash during polling
Merge branch 'better-polling-message'