I just picked up a new 5R with the X-Mark trigger on it. I've got a AICS stock on the way for the rifle, but after some reading, I'm not sure if the x-mark safety will fit in the AICS. Am I going to need to replace the trigger or safety to fit the AICS? If so, will any aftermarket 700 trigger...