I just ordered the new cupholders from Bill last week... I ordered them directly off the website using this part number XS2Z-5413562-BAA
its a complete replacement assembly and works much better.. My entire order was 40 something... if your lucky Bill will even throw in a free leather keychain