The latest for that is to have (11 and 15)--|66k|--(21). This probably works for the 2g too, and may be more universal. maybe someone else can comment on that.
I think everyone can now consider this the universal solution, thank you all for your advice/input.
PS joining pin 11 and 15 can simply be done by bending the pin legs. Easier than soldering an extra jumper wire. Also, my question (re echo) a few posts up was answered by the fact that after re-inerting pins 2-4 after soldering, they had come out slightly just before gluing. I recommend not pulling them out, just soldering whilst they're in.