I agree with polishing while apart. Not any of the new CGW parts, but the factory parts that should be polished include the trigger bar, hammer strut, and firing pin plunger block. There are a few other contact points, but these are the ones that have made the biggest difference on my CZ 75 variants. There are a lot of good on line resources available. Definitely look at several different you tube videos before you do any polishing.