Replace the old ADCE implementation with a new one that more simply solves