An improved corresponding states model for the prediction of oil and gas viscosities and thermal conductivities