Improved timeRemaining()