I have a M&P9 which has the mag safety and I was thinking about getting one in a 40 cal. Seems like all I can find is the version that does not have the mag safety. Is this the standard now or are they just moving guns without premag safety? I would like to be consistent with my guns, especially if they look alike. Thanks in advance for your input.