Conductivity calculation updated