Updates from ADC-team
remove double flag