Almost.

 Engine swap was a nightmare, very similar engines but one just does not fit in the frame.

 Found this in one engine's side cover.

 Here she is  running and almost done ,