Updates from ADC Team and some reordering