I had heard about getting a 9mm barrel and I'm thinking I might go that route. All the .40 I have is a box I bought the day I got the gun and while I ordered some 96 mags, I have a pile of 92 mags and plenty of 9mm ammo, so a barrel swap would be simple enough to go with.