Black Russian Big Muff tone bypass mod?

[scott_v]

Using this schematic http://www.premierguitar.com/Stream/StreamImage.aspx?Image_ID=589C27A9-F613-4506-B017-3C31A6001D5A&Image_Type=image and Jack Orman's method of removing the tone stack on a big muff would I be correct to say to do the "tone bypass", I need to lift the leads of R18 & C11 from ground and wire from the lifted lead of each of those components and from the associated open points on the circuit board to a dpdt (or spdt) switch to make the tone stack in/out switchable?

I got this from the NYC big muff tone bypass which is removing R5 & C8 from ground using this method:  http://roadsideguitars.blogspot.com/2009/04/adding-tone-bypass-to-ny-big-muff.html