Switch to op-amp based design