Changed logic for route times and refactoring.