Added Ovp header and source, moved some from Adc source