Updated TimeCalculator