Mitchell Schultz is a certified Winchester (discontinued models) gunsmith and is recommended by Pauline Muerrle, Winchester custom shop engraver (retired)...having said that, Lou at Galazan's did the same job for me as you evidently need. If you ask him to check the gun completely and fix what is needed, the gun will come back as tight as a brand new gun and be good for another 100,000 rounds or so. A repair letter will accompany the gun and Galazan's work does not affect the value or collector status of a 21. Good luck; you have an excellent shooter and the 21 Duck grade is considered one of the best American waterfowl guns.