ADC updated
merging