i dnt think u need to swap water pumps just sump oil pickup pipe 1800 flywheel and clutch and other ancilleries i.e engine mounts inlet pipe etc,ecu off 2.0