Restored the T calculation