removed flash
merge