Ya might try Flying Dragon Air Rifles. The tuner at this sight (Mike Melick) was getting Beeman R9 rifles in (17 & 22 cal). I got an R9 22cal from there back in march maybe ? He did some polishing this and that and worked in some magic. It has a great shot cycle and I got it for the same price as 1s from elsewhere that had not been massaged as his were.They r now $530 tuned and shipped. I have 2 other rifles,a B-25 & B46 that Mike has worked on. Color me impressed.