ADC finished 2.0
Merge ADC