You will need to check your wiring harness to determine which model CDI you will need. Going from my feeble memory, so may be wrong!, the PGM I was good for the mk1 MC18 and the PCM II was for the later mk2 (R4J). The latter PCM II has two long plugs similar to the MC21 PGM III.
cheers,