After years of carrying my M-40, it still bugs me to run about with only a thumb safety, prone to flipping off. I removed the magazine safety within one hour of owning it, as I find the idea assinine, but do agree that most SA auto-pistols need a secondary safety while loaded. Looking at the weapon, any ideas how to add a grip safety? I dont want to defeat the thumb safety. Maybe some light milling on right side to use the old mag safety channel?