I have the B58 which is fantastic and does come with an all metal, mechanical water pump which I thought would be a pleasant break, but my gasket still failed. BMW and water pumps, classic.