With Auxiliary Convexity, No Manual Switch

With Auxiliary Convexity, No Manual Switch