More reworking of conductivity code