Add flashes
Merge with master