Adding Flash Feature
Merge