Garand Firing Pin and Extractor Thoughts

Is this correct, or not, for a mid-war Winchester M1 Garand?

If not, what should it be?

Thanks

Any thoughts?

If there is a punch mark located on the ‘L’ part of the firing pin (rear) then it is a Type 2 WRA half-round. No punch mark, then it’s a Type2 SA half-round.

punch marks on firing pins and extractors alone do not make them WRA. SA sometimes punch marked these parts
IMO the firirng pin is SA. I do not know of anyway to tell the manufacture of extractors