Whelenman
A buddy of mine who is an airgun enthusiast volunteered the upgrades as a thank you for some work I've done. He said he had all the parts hanging around. I am very thankful, as the gun is now a completely different tool from the original and as such has become very useful