--- a/trip.php
+++ b/trip.php
@@ -17,22 +17,16 @@
  */
 include ('include/common.inc.php');
 $routetrips = Array();
-if (isset($routeids) && !isset($tripid)) {
-    foreach ($routeids as $routeid) {
-        $possibleTrip = getRouteNextTrip($routeid);
-        if (!isset($trip) || strtotime($possibleTrip['departure_time']) < strtotime($trip['departure_time'])) {
-            $trip = getRouteNextTrip($routeid);
-        }
+if (isset($routeid) && !isset($tripid)) {
+    $trip = getRouteNextTrip($routeid,$directionid);
+    
+    if (!($trip)) {
+        $trip = getRouteFirstTrip($routeid,$directionid);
     }
     $tripid = $trip['trip_id'];
 } else {
     $trip = getTrip($tripid);
-    $similarRoutes = getRoutesByNumber($trip['route_short_name'], $trip['direction_id'], strtolower($trip["service_id"]));
-    $routeids = Array();
-    foreach ($similarRoutes as $similarRoute) {
-        $routeids[] = $similarRoute['route_id'];
-    }
-    $routeids = array_unique($routeids);
+    $routeid = $trip['route_id'];
 }
 $directionid = $trip['direction_id'];
 $service_period = strtolower($trip["service_id"]);
@@ -43,49 +37,30 @@
 echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a>';
 echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';
 echo '<h2>Other Trips:</h2> ';
-echo "getRoutesTrips(".print_r($routeids,true).", {$trip['direction_id']}, $service_period)  $tripid";
-$routeTrips = getRoutesTrips($routeids, $trip['direction_id'], $service_period);
+$routeTrips = getRouteTrips($routeid, $trip['direction_id'], $service_period);
 foreach ($routeTrips as $key => $othertrip) {
-   // if ($othertrip['trip_id'] != $tripid) {
-        echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&amp;routeids=" . implode(",", $routeids) . '">' . str_replace("  ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
-  //  } else {
-        // skip this trip but look forward/back
-        if ($key - 1 > 0)
-            $prevTrip = $routeTrips[$key - 1]['trip_id'];
-        if ($key + 1 < sizeof($routeTrips))
-            $nextTrip = $routeTrips[$key + 1]['trip_id'];
-   // }
+    // if ($othertrip['trip_id'] != $tripid) {
+    echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&amp;routeid=" . $routeid . '">' . str_replace("  ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
+    //  } else {
+    // skip this trip but look forward/back
+    if ($key - 1 > 0)
+        $prevTrip = $routeTrips[$key - 1]['trip_id'];
+    if ($key + 1 < sizeof($routeTrips))
+        $nextTrip = $routeTrips[$key + 1]['trip_id'];
+    // }
 }
 flush();
 @ob_flush();
 echo '<h2>Other directions/timing periods:</h2> ';
 $otherDir = 0;
-$filteredRoutes = Array();
-foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
 
-    foreach (getRouteHeadsigns($row['route_id']) as $headsign) {
-        if ( $headsign['direction_id'] != $directionid || strtolower($headsign['service_id']) != $service_period) {
-           echo "{$headsign['direction_id']} != $directionid || ".strtolower($headsign['service_id'])." != $service_period <br>";
-            $start = $headsign['stop_name'];
+    foreach (getRouteHeadsigns($routeid) as $headsign) {
+        if ($headsign['direction_id'] != $directionid || strtolower($headsign['service_id']) != $service_period) {
 
-            $serviceday = strtolower($headsign['service_id']);
-            $key = $row['route_short_name'] . "." . $headsign['direction_id'];
-            if (isset($filteredRoutes[$key])) {
-                $filteredRoutes[$key]['route_ids'][] = $row['route_id'];
-                $filteredRoutes[$key]['route_ids'] = array_unique($filteredRoutes[$key]['route_ids']);
-            } else {
-                $filteredRoutes[$key]['route_short_name'] = $row['route_short_name'];
-                $filteredRoutes[$key]['route_long_name'] = "Starting at " . $start;
-                $filteredRoutes[$key]['service_id'] = $serviceday;
-                $filteredRoutes[$key]['direction_id'] = $headsign['direction_id'];
-            }
+            echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> ';
+            $otherDir++;
         }
     }
-}
-foreach ($filteredRoutes as $key => $row) {
-    echo '<a href="trip.php?routeids=' . implode(",",$row['route_ids']) . '&directionid='.$row['direction_id'].'&service_period='.$row['service_id'].'">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
-    $otherDir++;
-}
 
 if ($otherDir == 0) {
     echo "None";
@@ -95,9 +70,9 @@
 @ob_flush();
 echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";
 if ($nextTrip)
-    echo '<a href="trip.php?tripid=' . $nextTrip . "&amp;routeids=" . implode(",", $routeids) . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
+    echo '<a href="trip.php?tripid=' . $nextTrip . "&amp;routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
 if ($prevTrip)
-    echo '<a href="trip.php?tripid=' . $prevTrip . "&amp;routeids=" . implode(",", $routeids) . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';
+    echo '<a href="trip.php?tripid=' . $prevTrip . "&amp;routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';
 echo "</div>";
 echo '  <ul data-role="listview"  data-inset="true">';
 $stopsGrouped = Array();