Merged the adc stuff