Added flag selector
Fix sam conflict