Planet Eclipse sell the fill rigs at a good price. I just got mine from them and it's good. Do you have a scuba shop near you? Try one of those if you can. The one near me often has second hand tanks for sale, often having recently been retested, all for reasonable prices. You can also check the external condition of it while you're there.