Diverse fix on set/add flash
WIP Story