Improved HTC calculation and phase switching