Time calculation updated