Yes, I did all of it. A while later I did the trigger bar and sear, basically a Burwell trigger job without doing the striker block or any filing of the sear, it made quite an improvement.