Thats what i did last night.

adding connectors on the plugs i have extended the cables to the correct point. Yes is easyer that a fart but, but i was most worried about the MC18 Flywheel timing if is different than MC21 then i don't know i might make a damage.

James