diff --git a/app-android/src/main/play/release-notes/en-US/default.txt b/app-android/src/main/play/release-notes/en-US/default.txt
index 2be3922f..adc31a7e 100644
--- a/app-android/src/main/play/release-notes/en-US/default.txt
+++ b/app-android/src/main/play/release-notes/en-US/default.txt
@@ -1 +1 @@
-Schedule from September 3, 2024 to December 1, 2024.
+Schedule from September 8, 2024 to December 1, 2024.
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
index a23a67bb..cec9ce01 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,16 +1,3 @@
-'3132',20240903,1
-'3201',20240903,1
-'3205',20240903,1
-'3132',20240904,1
-'3201',20240904,1
-'3264',20240904,1
-'3132',20240905,1
-'3201',20240905,1
-'3205',20240905,1
-'3132',20240906,1
-'3211',20240906,1
-'3264',20240906,1
-'3133',20240907,1
 '3134',20240908,1
 '3132',20240909,1
 '3201',20240909,1
@@ -26,7 +13,7 @@
 '3132',20240913,1
 '3211',20240913,1
 '3264',20240913,1
-'3133',20240914,1
+'2375',20240914,1
 '3134',20240915,1
 '3132',20240916,1
 '3201',20240916,1
@@ -42,7 +29,7 @@
 '3132',20240920,1
 '3211',20240920,1
 '3264',20240920,1
-'3133',20240921,1
+'2375',20240921,1
 '3134',20240922,1
 '3132',20240923,1
 '3201',20240923,1
@@ -58,7 +45,7 @@
 '3132',20240927,1
 '3211',20240927,1
 '3264',20240927,1
-'3133',20240928,1
+'2375',20240928,1
 '3134',20240929,1
 '3132',20241001,1
 '3201',20241001,1
@@ -72,7 +59,7 @@
 '3132',20241004,1
 '3211',20241004,1
 '3264',20241004,1
-'3133',20241005,1
+'2375',20241005,1
 '3134',20241006,1
 '3132',20241007,1
 '3201',20241007,1
@@ -88,7 +75,7 @@
 '3132',20241011,1
 '3211',20241011,1
 '3264',20241011,1
-'3133',20241012,1
+'2375',20241012,1
 '3134',20241013,1
 '3132',20241015,1
 '3201',20241015,1
@@ -102,7 +89,7 @@
 '3132',20241018,1
 '3211',20241018,1
 '3264',20241018,1
-'3133',20241019,1
+'2375',20241019,1
 '3134',20241020,1
 '3132',20241021,1
 '3201',20241021,1
@@ -118,7 +105,7 @@
 '3132',20241025,1
 '3211',20241025,1
 '3264',20241025,1
-'3133',20241026,1
+'2375',20241026,1
 '3134',20241027,1
 '3132',20241028,1
 '3201',20241028,1
@@ -134,7 +121,7 @@
 '3132',20241101,1
 '3211',20241101,1
 '3264',20241101,1
-'3133',20241102,1
+'2375',20241102,1
 '3134',20241103,1
 '3132',20241104,1
 '3201',20241104,1
@@ -150,7 +137,7 @@
 '3132',20241108,1
 '3211',20241108,1
 '3264',20241108,1
-'3133',20241109,1
+'2375',20241109,1
 '3134',20241110,1
 '3132',20241112,1
 '3201',20241112,1
@@ -164,7 +151,7 @@
 '3132',20241115,1
 '3211',20241115,1
 '3264',20241115,1
-'3133',20241116,1
+'2375',20241116,1
 '3134',20241117,1
 '3132',20241118,1
 '3201',20241118,1
@@ -180,7 +167,7 @@
 '3132',20241122,1
 '3211',20241122,1
 '3264',20241122,1
-'3133',20241123,1
+'2375',20241123,1
 '3134',20241124,1
 '3132',20241125,1
 '3201',20241125,1
@@ -196,5 +183,5 @@
 '3132',20241129,1
 '3211',20241129,1
 '3264',20241129,1
-'3133',20241130,1
+'2375',20241130,1
 '3134',20241201,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103860 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103860
index cd20c9e6..4801cf9a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103860
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103860
@@ -1,2 +1,2 @@
+'2375',1201,122300,,'',0,60000,,'',0
 '3132',1201,65100,,'',0,16500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,122300,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103861 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103861
index 76ab4000..f873b272 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103861
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103861
@@ -1,2 +1,2 @@
+'2375',1201,123200,,'',0,60000,,'',0
 '3132',1201,70000,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,123200,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103862 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103862
index c2dac30a..6d6e6b38 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103862
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103862
@@ -1,7 +1,7 @@
+'2375',1000,101800,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,75500,,'',0,5000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,101800,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,113600,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90800,,'',0,21400,,'',0,48600,,'',0
+'2375',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3132',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3134',2001,130500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103863 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103863
index 33a6fb39..c115ef8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103863
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103863
@@ -1,5 +1,5 @@
+'2375',1000,101000,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,75700,,'',0,7500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,101000,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,112800,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90000,,'',0,21400,,'',0,48600,,'',0
 '3205',1401,85200,4,'',0,25400,4,'',0,44600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103864 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103864
index 1783fa37..b2e7c91c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103864
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103864
@@ -1,3 +1,3 @@
+'2375',1000,100400,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,75100,,'',0,7500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,100400,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,112200,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103865 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103865
index 2a2b648a..4ad1fed8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103865
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103865
@@ -1,4 +1,4 @@
+'2375',1001,91100,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3132',1001,71900,,'',0,3600,,'',0,16900,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,91100,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3134',1001,105000,,'',0,68200,,'',0
 '3205',1401,84500,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103867 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103867
index 3ceeda9e..0c588110 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103867
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103867
@@ -1,7 +1,7 @@
+'2375',1001,90800,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3132',1001,71600,,'',0,20500,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,90800,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3134',1001,104700,,'',0,68200,,'',0
 '3205',1401,84300,,'',0,21400,,'',0,48600,,'',0
+'2375',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3132',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3134',2001,130500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103868 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103868
index 59f3cf0d..82f66d6d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103868
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103868
@@ -1,7 +1,7 @@
+'2375',1001,90800,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39000,,'',0
 '3132',1001,71600,,'',0,20500,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38200,,'',0
-'3133',1001,90800,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39000,,'',0
 '3134',1001,104700,,'',0,68200,,'',0
 '3205',1401,84300,,'',0,21400,,'',0,48600,,'',0
+'2375',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3132',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3134',2001,130500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103869 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103869
index 07aff0fa..94356ac7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103869
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103869
@@ -1,4 +1,4 @@
+'2375',1000,102000,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,75700,,'',0,5000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,102000,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,113700,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90900,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103870 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103870
index a0ac503a..db966ada 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103870
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103870
@@ -1,3 +1,3 @@
+'2375',400,90400,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3132',400,80700,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
-'3133',400,90400,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3134',400,124500,,'',0,29200,,'',0,38300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103871 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103871
index 75982310..1aa97340 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103871
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103871
@@ -1,3 +1,3 @@
+'2375',400,90300,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3132',400,80600,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
-'3133',400,90300,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3134',400,124400,,'',0,29200,,'',0,38300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103872 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103872
index 0681a40c..77319c7c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103872
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103872
@@ -1,3 +1,3 @@
+'2375',401,85200,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
 '3132',401,85700,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10100,,'',0,18900,,'',0,11700,,'',0,10700,,'',0
-'3133',401,85200,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
 '3134',401,91700,,'',0,31500,,'',0,29200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104056
index a76bd5c6..21d01f12 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104056
@@ -1,4 +1,4 @@
+'2375',1000,94800,,'',0,80400,,'',0
+'2375',1001,94000,4,'',0,80700,4,'',0
 '3132',1000,100200,,'',0,80200,,'',0
 '3132',1001,95400,4,'',0,80200,4,'',0
-'3133',1000,94800,,'',0,80400,,'',0
-'3133',1001,94000,4,'',0,80700,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110248
index e155028f..1118250f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110248
@@ -1,4 +1,4 @@
+'2375',601,83400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,63900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,101900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,82800,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110270
index 04d06f71..aea17fd9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110270
@@ -1,4 +1,4 @@
+'2375',500,152600,0,'Vanier',0
 '3132',500,81500,0,'Vanier',0,3000,0,'Vanier',0,67400,0,'Vanier',0,10400,0,'Vanier',0
-'3133',500,152600,0,'Vanier',0
+'2375',1200,114000,,'',0,59900,,'',0
 '3132',1200,60900,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,114000,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110305
index b95a9943..fbe2226b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110305
@@ -1,8 +1,8 @@
+'2375',101,73400,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
 '3132',101,60200,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,1200,0,'Downtown',0,4300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10700,,'',0,3500,,'',0,15700,,'',0
-'3133',101,73400,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
 '3134',101,92000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
 '3201',101,154300,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0
 '3211',101,154300,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2375',1101,100800,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
 '3132',1101,73400,,'',0,27300,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39900,,'',0,33000,,'',0
-'3133',1101,100800,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
 '3132',1201,72500,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110324
index 02d2c6cc..8ea2254d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110324
@@ -1,3 +1,3 @@
+'2375',1001,92400,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3132',1001,73200,,'',0,7500,,'',0,13000,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,92400,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3134',1001,110300,,'',0,64200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110336
index 0f4ea6c3..c4c17065 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110336
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110336
@@ -1,3 +1,3 @@
+'2375',1000,100800,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,75500,,'',0,7500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,100800,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,112600,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110337
index 1403c4d4..73571bee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110337
@@ -1,4 +1,4 @@
+'2375',1000,101500,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,80200,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,101500,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,113300,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90500,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110338 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110338
index f119f8d3..291b692f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110338
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110338
@@ -1,4 +1,4 @@
+'2375',1000,101700,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,80400,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,101700,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,113500,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90700,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110377 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110377
index d98a5647..e97978d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110377
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110377
@@ -1,3 +1,3 @@
+'2375',401,85100,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
 '3132',401,85600,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10000,,'',0,15000,,'',0,15700,,'',0,10700,,'',0
-'3133',401,85100,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
 '3134',401,91600,,'',0,31500,,'',0,29200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110379 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110379
index 98394765..2f734ccb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110379
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110379
@@ -1,3 +1,3 @@
+'2375',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
 '3132',1100,70700,,'',0,23000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
-'3133',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
 '3205',1301,95000,,'',0,25400,,'',0,44600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110398 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110398
index baf467f4..7e8ba44e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110398
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110398
@@ -1,2 +1,2 @@
+'2375',1200,120500,,'',0,59900,,'',0
 '3132',1200,63400,,'',0,12500,,'',0,44600,,'',0,15300,,'',0,34600,,'',0,10000,,'',0
-'3133',1200,120500,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110413 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110413
index ed91a3e7..427f7616 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110413
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110413
@@ -1,2 +1,2 @@
+'2375',1201,122800,,'',0,60000,,'',0
 '3132',1201,65600,,'',0,16500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,122800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110493 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110493
index 90ed74b2..5a7cdd28 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110493
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110493
@@ -1,4 +1,4 @@
+'2375',1001,91200,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3132',1001,72000,,'',0,3600,,'',0,16900,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,91200,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3134',1001,105100,,'',0,68200,,'',0
 '3205',1401,84700,,'',0,25400,,'',0,44600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110523 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110523
index e55e2c19..137f586e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110523
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110523
@@ -1,4 +1,4 @@
+'2375',1001,91700,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3132',1001,72500,,'',0,7500,,'',0,13000,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,91700,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3134',1001,105600,,'',0,68200,,'',0
 '3205',1401,85200,,'',0,25400,,'',0,44600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110525 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110525
index 49bb4b44..349e07b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110525
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110525
@@ -1,2 +1,2 @@
+'2375',1101,95700,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1101,72400,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'3133',1101,95700,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110526 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110526
index 9e594650..fd793eed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110526
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110526
@@ -1,7 +1,7 @@
+'2375',500,153000,4,'',0
+'2375',501,153000,0,'Vanier',0
 '3132',500,81800,4,'',0,3000,4,'',0,67500,4,'',0,10400,4,'',0
 '3132',501,81800,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
-'3133',500,153000,4,'',0
-'3133',501,153000,0,'Vanier',0
-'3133',1201,125100,,'',0,60000,,'',0
+'2375',1201,125100,,'',0,60000,,'',0
 '3205',1301,102100,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,85400,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110528 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110528
index 1cadbb93..dd40062a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110528
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110528
@@ -1,2 +1,2 @@
+'2375',1001,85300,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3132',1001,70100,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1001,85300,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110529 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110529
index e2692b5a..efcb6782 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110529
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110529
@@ -1,2 +1,2 @@
+'2375',1000,102900,,'',0,40100,,'',0,40300,,'',0,36800,,'',0
 '3132',1000,80600,,'',0,1000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,35500,,'',0
-'3133',1000,102900,,'',0,40100,,'',0,40300,,'',0,36800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110530 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110530
index 9765c5ae..354eb716 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110530
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110530
@@ -1,5 +1,5 @@
+'2375',100,74500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,63000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9500,,'',0,7500,,'',0,11500,,'',0
-'3133',100,74500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92400,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161700,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161700,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110531 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110531
index 0630a4fb..b9f98e10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110531
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110531
@@ -1,15 +1,15 @@
+'2375',100,80500,4,'',0,9900,4,'',0,4100,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8100,4,'',0,8100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3300,4,'',0,7900,4,'',0,7900,4,'',0,4000,4,'',0,8000,4,'',0,10500,4,'',0,17500,4,'',0
 '3132',100,64800,4,'',0,7000,4,'',0,1900,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1600,4,'',0,6500,4,'',0,2000,4,'',0,6200,4,'',0,2000,4,'',0,2100,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,700,4,'',0,6300,4,'',0,1800,4,'',0,4100,4,'',0,6000,4,'',0,2100,4,'',0,6900,4,'',0,9300,4,'',0,3500,4,'',0,11400,4,'',0
-'3133',100,80500,4,'',0,9900,4,'',0,4100,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8100,4,'',0,8100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3300,4,'',0,7900,4,'',0,7900,4,'',0,4000,4,'',0,8000,4,'',0,10500,4,'',0,17500,4,'',0
 '3134',100,94500,4,'',0,8500,4,'',0,9500,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,9000,4,'',0,10000,4,'',0,9800,4,'',0,9800,4,'',0,5000,4,'',0,9900,4,'',0
 '3201',100,163900,4,'',0,19300,4,'',0,17900,4,'',0,12000,4,'',0,10500,4,'',0
 '3211',100,163900,4,'',0,19300,4,'',0,17900,4,'',0,12000,4,'',0,10500,4,'',0,17500,4,'',0
+'2375',301,81000,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,73100,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81000,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,84000,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,144500,,'',0,20000,,'',0
 '3211',301,144500,,'',0,20000,,'',0
+'2375',400,91200,4,'',0,12200,4,'',0,11500,4,'',0,15600,4,'',0,11000,4,'',0,10000,4,'',0,10300,4,'',0,12200,4,'',0,16100,4,'',0
 '3132',400,81400,4,'',0,10300,4,'',0,10100,4,'',0,10600,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,19000,4,'',0,11900,4,'',0,15900,4,'',0
-'3133',400,91200,4,'',0,12200,4,'',0,11500,4,'',0,15600,4,'',0,11000,4,'',0,10000,4,'',0,10300,4,'',0,12200,4,'',0,16100,4,'',0
 '3134',400,125300,4,'',0,29200,4,'',0,38200,4,'',0
 '3264',1500,93700,4,'',0,8000,4,'',0,4000,4,'',0,28000,4,'',0,8000,4,'',0,4000,4,'',0
 '3264',1501,90000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110532 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110532
index b554bce4..98a2b7fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110532
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110532
@@ -1,10 +1,10 @@
+'2375',100,80200,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64500,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5300,,'',0,7500,,'',0,11400,,'',0
-'3133',100,80200,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,94100,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,5800,,'',0,9000,,'',0,9900,,'',0
 '3201',100,163500,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163500,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2375',301,82500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,82900,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,82500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85500,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150000,,'',0,20000,,'',0
 '3211',301,150000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110533 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110533
index b9941fe5..92262c48 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110533
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110533
@@ -1,5 +1,5 @@
+'2375',301,83000,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83400,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,83000,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,85900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150500,,'',0,20000,,'',0
 '3211',301,150500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110534 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110534
index ca085c39..97742466 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110534
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110534
@@ -1,5 +1,5 @@
+'2375',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83700,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,90200,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150800,,'',0,20000,,'',0
 '3211',301,150800,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110535 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110535
index ca085c39..97742466 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110535
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110535
@@ -1,5 +1,5 @@
+'2375',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83700,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,90200,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150800,,'',0,20000,,'',0
 '3211',301,150800,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110536 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110536
index e540330e..c82cf09d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110536
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110536
@@ -1,5 +1,5 @@
+'2375',301,83400,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83800,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,83400,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,90300,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150900,,'',0,20000,,'',0
 '3211',301,150900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110537 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110537
index 4ee6df3e..9b20d11e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110537
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110537
@@ -1,5 +1,5 @@
+'2375',301,81100,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,73200,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81100,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,84100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,144600,,'',0,20000,,'',0
 '3211',301,144600,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110538 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110538
index 8e45e8e8..e358bbf9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110538
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110538
@@ -1,5 +1,5 @@
+'2375',301,81200,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73300,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81200,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,144700,,'',0,20000,,'',0
 '3211',301,144700,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110539 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110539
index 061ea604..ed202770 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110539
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110539
@@ -1,5 +1,5 @@
+'2375',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62600,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9600,,'',0,7500,,'',0,11500,,'',0
-'3133',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,91900,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161200,,'',0,19700,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161200,,'',0,19700,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110542 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110542
index d039c94f..5a0cfb4c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110542
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110542
@@ -1,2 +1,2 @@
+'2375',1200,115500,,'',0,59900,,'',0
 '3132',1200,62400,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,115500,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110543 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110543
index 16c1144e..53d61cca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110543
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110543
@@ -1,2 +1,2 @@
+'2375',1201,123300,,'',0,60000,,'',0
 '3132',1201,70100,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,123300,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110544 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110544
index af38efc2..54afae78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110544
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110544
@@ -1,2 +1,2 @@
+'2375',1200,115800,,'',0,59900,,'',0
 '3132',1200,62700,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,115800,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110545 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110545
index 9ce520bf..65769051 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110545
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110545
@@ -1,3 +1,3 @@
+'2375',400,90500,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3132',400,80800,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
-'3133',400,90500,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3134',400,124600,,'',0,29200,,'',0,38300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110546 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110546
index f682f2ac..16e553ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110546
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110546
@@ -1,2 +1,2 @@
+'2375',1200,114400,,'',0,59900,,'',0
 '3132',1200,61300,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,114400,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110547 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110547
index c840ade9..1e11d487 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110547
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110547
@@ -1,2 +1,2 @@
+'2375',1201,124800,,'',0,60000,,'',0
 '3132',1201,71600,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,124800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110550 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110550
index 2d607da4..5c1f0bb1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110550
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110550
@@ -1,3 +1,3 @@
+'2375',800,84300,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,63400,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,84300,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,95000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110551 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110551
index 71be52d6..5e9968d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110551
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110551
@@ -1,3 +1,3 @@
+'2375',1000,100000,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,74700,,'',0,7500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,100000,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,111800,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110552 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110552
index 5fa00bb2..b68d0f87 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110552
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110552
@@ -1,5 +1,5 @@
+'2375',301,81500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73600,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84500,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145000,,'',0,20000,,'',0
 '3211',301,145000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110553 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110553
index 3c0908a6..a340e764 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110553
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110553
@@ -1,2 +1,2 @@
+'2375',1201,122400,,'',0,60000,,'',0
 '3132',1201,65200,,'',0,16500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,122400,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110554 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110554
index 72c48b61..b15197b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110554
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110554
@@ -1,2 +1,2 @@
+'2375',1201,122500,,'',0,60000,,'',0
 '3132',1201,65300,,'',0,16500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,122500,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110565 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110565
index 879dbd0f..705be17d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110565
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110565
@@ -1,3 +1,3 @@
+'2375',601,82800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,63300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,101300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110566 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110566
index 18089c94..97bb9673 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110566
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_110566
@@ -1,3 +1,3 @@
+'2375',800,84500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
 '3132',800,63600,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',800,84500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
 '3134',800,95200,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111270
index 095bf2a8..511ab5d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111270
@@ -1,5 +1,5 @@
+'2375',101,73900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,60700,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10600,,'',0,3500,,'',0,15700,,'',0
-'3133',101,73900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,92600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,5800,,'',0
 '3201',101,154900,,'',0,19300,,'',0,18800,,'',0,11800,,'',0,10500,,'',0
 '3211',101,154900,,'',0,19300,,'',0,18800,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111271
index 7d36aa6e..1af1ec7c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111271
@@ -1,5 +1,5 @@
+'2375',101,74100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,60900,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10600,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,92800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155100,,'',0,19300,,'',0,18800,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155100,,'',0,19300,,'',0,18800,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111272 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111272
index 5d20fa47..b0d12fb0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111272
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111272
@@ -1,5 +1,5 @@
+'2375',101,74400,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,61100,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10500,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74400,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,93100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155400,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155400,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111273 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111273
index 76e19fca..2b388433 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111273
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111273
@@ -1,5 +1,5 @@
+'2375',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,61200,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10500,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,93200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155500,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155500,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111274
index 76e19fca..2b388433 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111274
@@ -1,5 +1,5 @@
+'2375',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,61200,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10500,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,93200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155500,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155500,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111275 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111275
index a9baefaa..c14c77d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111275
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111275
@@ -1,30 +1,30 @@
+'2375',100,83500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2375',101,74900,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,4000,4,'',0,8000,4,'',0,7900,4,'',0,4000,4,'',0,14500,4,'',0,10900,4,'',0
 '3132',100,62200,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9700,,'',0,7500,,'',0,11500,,'',0
 '3132',101,61700,4,'',0,2900,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5700,4,'',0,1500,4,'',0,2500,4,'',0,6000,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,3100,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3400,4,'',0,7500,4,'',0,3000,4,'',0,7100,4,'',0,2000,4,'',0,1000,4,'',0,7200,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,10500,4,'',0,7500,4,'',0,11700,4,'',0
-'3133',100,83500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'3133',101,74900,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,4000,4,'',0,8000,4,'',0,7900,4,'',0,4000,4,'',0,14500,4,'',0,10900,4,'',0
 '3134',100,91500,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3134',101,93600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,8900,4,'',0,10000,4,'',0,9900,4,'',0,9400,4,'',0,8900,4,'',0,9800,4,'',0
 '3201',100,160700,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3201',101,160000,4,'',0,15300,4,'',0,18700,4,'',0,11800,4,'',0,14500,4,'',0
 '3211',100,160700,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
 '3211',101,160000,4,'',0,15300,4,'',0,18700,4,'',0,11800,4,'',0,14500,4,'',0,10900,4,'',0
+'2375',200,83100,4,'',0,11000,4,'',0,11500,4,'',0,15000,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,10000,4,'',0,11500,4,'',0,16000,4,'',0,14000,4,'',0,19300,4,'',0
+'2375',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',200,64200,4,'',0,8500,4,'',0,12500,4,'',0,9500,4,'',0,10500,4,'',0,10500,4,'',0,14900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,4000,4,'',0,8300,4,'',0,7100,4,'',0,5400,4,'',0,15200,4,'',0,14000,4,'',0
 '3132',201,61500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',200,83100,4,'',0,11000,4,'',0,11500,4,'',0,15000,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,10000,4,'',0,11500,4,'',0,16000,4,'',0,14000,4,'',0,19300,4,'',0
-'3133',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',200,95600,4,'',0,37500,4,'',0,20000,4,'',0,19700,4,'',0,19400,4,'',0
 '3134',201,92900,,'',0,77200,,'',0,15400,,'',0
 '3211',200,233900,4,'',0
 '3211',201,231200,,'',0
+'2375',800,83100,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2375',801,91400,4,'',0,10800,4,'',0,11000,4,'',0,10700,4,'',0,10500,4,'',0,9800,4,'',0,11500,4,'',0,14700,4,'',0,11500,4,'',0,11300,4,'',0,18700,4,'',0
 '3132',800,62200,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9900,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
 '3132',801,70000,4,'',0,12500,4,'',0,9500,4,'',0,9800,4,'',0,10500,4,'',0,10900,4,'',0,10700,4,'',0,9300,4,'',0,12100,4,'',0,14900,4,'',0,12500,4,'',0,11200,4,'',0,18000,4,'',0
-'3133',800,83100,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'3133',801,91400,4,'',0,10800,4,'',0,11000,4,'',0,10700,4,'',0,10500,4,'',0,9800,4,'',0,11500,4,'',0,14700,4,'',0,11500,4,'',0,11300,4,'',0,18700,4,'',0
 '3134',800,93800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
 '3134',801,105500,4,'',0,20200,4,'',0,19700,4,'',0,20100,4,'',0,20000,4,'',0
 '3134',1000,114000,4,'',0,68400,4,'',0
 '3134',1001,104000,,'',0,68200,,'',0
 '3205',1400,91200,,'',0,21400,,'',0,48600,,'',0
+'2375',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
 '3132',2001,101800,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
 '3134',2001,125700,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111276 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111276
index adadb4be..286b8460 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111276
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111276
@@ -1,17 +1,17 @@
+'2375',100,83600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62300,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9700,,'',0,7500,,'',0,11500,,'',0
-'3133',100,83600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,91600,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,160800,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,160800,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2375',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',201,61500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',201,92900,,'',0,77200,,'',0,15400,,'',0
 '3211',201,231200,,'',0
+'2375',800,83200,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62300,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9900,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83200,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,93900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
 '3134',1001,104000,,'',0,68200,,'',0
 '3205',1400,91300,,'',0,21400,,'',0,48600,,'',0
+'2375',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
 '3132',2001,101800,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
 '3134',2001,125700,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111277
index cde8d38d..78095b60 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111277
@@ -1,10 +1,10 @@
+'2375',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62400,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9700,,'',0,7500,,'',0,11500,,'',0
-'3133',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,91700,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,160900,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,160900,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
 '3132',200,75700,0,'Comox Mall',0
+'2375',800,83300,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62400,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9900,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83300,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
 '3205',1400,91400,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111278
index 0666393a..4768edfe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111278
@@ -1,25 +1,25 @@
+'2375',100,83800,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62500,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9700,,'',0,7500,,'',0,11500,,'',0
-'3133',100,83800,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,91800,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161000,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161000,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
 '3132',200,75800,4,'',0
+'2375',400,85900,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2375',401,85700,4,'',0,16200,4,'',0,11500,4,'',0,11600,4,'',0,15000,4,'',0,10000,4,'',0,13200,4,'',0,10400,4,'',0,10100,4,'',0
 '3132',400,80200,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
 '3132',401,90200,4,'',0,10100,4,'',0,10600,4,'',0,10000,4,'',0,10800,4,'',0,10100,4,'',0,19000,4,'',0,11500,4,'',0,10600,4,'',0
-'3133',400,85900,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'3133',401,85700,4,'',0,16200,4,'',0,11500,4,'',0,11600,4,'',0,15000,4,'',0,10000,4,'',0,13200,4,'',0,10400,4,'',0,10100,4,'',0
 '3134',400,124000,,'',0,29200,,'',0,38300,,'',0
 '3134',401,92300,4,'',0,31500,4,'',0,29200,4,'',0
 '3132',500,80700,0,'Vanier',0,3000,0,'Vanier',0
+'2375',701,90600,4,'',0,65300,4,'',0
 '3132',701,80300,4,'',0,74900,4,'',0,8200,4,'',0
-'3133',701,90600,4,'',0,65300,4,'',0
+'2375',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62500,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94100,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
+'2375',1000,102500,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
+'2375',1001,85900,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3132',1000,80200,,'',0,1000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
 '3132',1001,70700,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1000,102500,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
-'3133',1001,85900,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3205',1400,91500,,'',0,21400,,'',0,48700,,'',0
 '3205',1401,83600,,'',0,21400,,'',0,48600,,'',0
 '3132',2001,160900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111280 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111280
index 5d692a20..b4dc509d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111280
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111280
@@ -1,5 +1,5 @@
+'2375',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62600,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9700,,'',0,7500,,'',0,11500,,'',0
-'3133',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,91900,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161100,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161100,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111281 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111281
index 1affc381..6bba8912 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111281
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111281
@@ -1,5 +1,5 @@
+'2375',100,84000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62700,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9600,,'',0,7500,,'',0,11500,,'',0
-'3133',100,84000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92000,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161300,,'',0,19700,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161300,,'',0,19700,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111282
index 1c0b0465..630ebe0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111282
@@ -1,5 +1,5 @@
+'2375',100,84100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62800,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9600,,'',0,7500,,'',0,11500,,'',0
-'3133',100,84100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92100,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161400,,'',0,19700,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161400,,'',0,19700,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111284 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111284
index caac339c..bbbc496e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111284
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111284
@@ -1,5 +1,5 @@
+'2375',100,84200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62800,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9500,,'',0,7500,,'',0,11500,,'',0
-'3133',100,84200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92200,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161500,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161500,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111286
index 8b0755cb..91ec2ffc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111286
@@ -1,11 +1,11 @@
+'2375',100,84300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62900,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9500,,'',0,7500,,'',0,11500,,'',0
-'3133',100,84300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92300,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161600,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161600,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2375',701,111000,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70500,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,111000,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
+'2375',800,84700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
 '3132',800,63800,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',800,84700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
 '3134',800,95400,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
 '3205',1400,92200,,'',0,21400,,'',0,48700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111288
index ccc57f4a..ab292a1c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111288
@@ -1,3 +1,3 @@
+'2375',2001,81400,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3132',2001,103500,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,81400,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3134',2001,131400,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111289
index 66bbc3e2..1d387100 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111289
@@ -1,7 +1,7 @@
+'2375',201,92500,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',201,62600,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',201,92500,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',201,94000,,'',0,77200,,'',0,19400,,'',0
 '3211',201,232300,,'',0
+'2375',2001,81500,,'',0,22500,,'',0,11000,,'',0,35000,,'',0,11500,,'',0,33500,,'',0
 '3132',2001,103600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,81500,,'',0,22500,,'',0,11000,,'',0,35000,,'',0,11500,,'',0,33500,,'',0
 '3134',2001,131500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111290
index da8f634f..73731cfa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111290
@@ -1,11 +1,11 @@
+'2375',200,81500,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
+'2375',201,92500,4,'',0,32500,4,'',0,10500,4,'',0,36000,4,'',0,11500,4,'',0,30000,4,'',0,19300,4,'',0
 '3132',200,62600,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
 '3132',201,62600,4,'',0,8500,4,'',0,2900,4,'',0,9600,4,'',0,9500,4,'',0,41900,4,'',0,20000,4,'',0,16300,4,'',0,12500,4,'',0,11200,4,'',0,18000,4,'',0
-'3133',200,81500,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'3133',201,92500,4,'',0,32500,4,'',0,10500,4,'',0,36000,4,'',0,11500,4,'',0,30000,4,'',0,19300,4,'',0
 '3134',200,94000,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3134',201,94000,4,'',0,77200,4,'',0,19400,4,'',0
 '3211',200,232300,,'',0
 '3211',201,232300,4,'',0
+'2375',2001,81500,4,'',0,22500,4,'',0,11000,4,'',0,35000,4,'',0,11500,4,'',0,33500,4,'',0
 '3132',2001,103600,4,'',0,10500,4,'',0,10900,4,'',0,20000,4,'',0,18000,4,'',0,11400,4,'',0
-'3133',2001,81500,4,'',0,22500,4,'',0,11000,4,'',0,35000,4,'',0,11500,4,'',0,33500,4,'',0
 '3134',2001,131500,4,'',0,20000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111291
index 5f941e01..3418063d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111291
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111291
@@ -1,4 +1,4 @@
+'2375',200,81600,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,62700,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,81600,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94100,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111292
index 89b559bc..d4e31c26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111292
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111292
@@ -1,4 +1,4 @@
+'2375',200,81700,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,62800,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,81700,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94200,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111293
index 1b649339..0872d298 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111293
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111293
@@ -1,4 +1,4 @@
+'2375',200,81800,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,62900,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,81800,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94300,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111294
index b5a3efdf..3cca6a33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111294
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111294
@@ -1,4 +1,4 @@
+'2375',200,82000,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,63100,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,82000,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94500,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111295
index 3bacea26..a55ea4b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111295
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111295
@@ -1,4 +1,4 @@
+'2375',200,82100,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,63200,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,82100,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94600,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111296
index 05525988..35fd634b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111296
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111296
@@ -1,16 +1,16 @@
+'2375',100,74700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,63200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,6100,,'',0,2100,,'',0,2900,,'',0,9500,,'',0,7500,,'',0,11500,,'',0
-'3133',100,74700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92600,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161900,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161900,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2375',500,152400,0,'Vanier',0
 '3132',500,151700,0,'Vanier',0,10400,0,'Vanier',0
-'3133',500,152400,0,'Vanier',0
+'2375',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1100,92600,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37100,,'',0
 '3132',1100,65600,,'',0,27000,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
-'3133',1100,92600,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37100,,'',0
+'2375',1200,113800,,'',0,59900,,'',0
 '3132',1200,60700,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,113800,,'',0,59900,,'',0
 '3205',1301,93900,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,80000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111297 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111297
index ecb9fd36..47168d33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111297
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111297
@@ -1,12 +1,12 @@
+'2375',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,63200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,6100,,'',0,2100,,'',0,2900,,'',0,9400,,'',0,7500,,'',0,11500,,'',0
-'3133',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92700,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,162000,,'',0,19500,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,162000,,'',0,19500,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2375',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1100,92600,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
 '3132',1100,65700,,'',0,26900,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
-'3133',1100,92600,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
 '3205',1301,93900,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,80100,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111298 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111298
index da0e458f..b1122852 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111298
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111298
@@ -1,12 +1,12 @@
+'2375',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,63300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,2900,,'',0,9500,,'',0,7500,,'',0,11500,,'',0
-'3133',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92700,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,162100,,'',0,19500,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,162100,,'',0,19500,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2375',601,81800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,81800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1100,92700,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
 '3132',1100,65800,,'',0,26900,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
-'3133',1100,92700,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
 '3205',1301,94000,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,80100,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111299 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111299
index bd0b938b..de6973c9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111299
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111299
@@ -1,5 +1,5 @@
+'2375',601,83200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,63700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,101700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',1201,72200,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
 '3205',1301,94400,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111300 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111300
index 0863ad3a..5df4cc46 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111300
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111300
@@ -1,5 +1,5 @@
+'2375',100,75500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,63800,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,6000,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,2900,,'',0,9300,,'',0,7500,,'',0,11500,,'',0
-'3133',100,75500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93400,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
 '3201',100,162800,,'',0,19300,,'',0,18000,,'',0,12000,,'',0,10500,,'',0
 '3211',100,162800,,'',0,19300,,'',0,18000,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111301 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111301
index 9f5ba090..686b2e81 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111301
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111301
@@ -1,5 +1,5 @@
+'2375',100,75600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,2900,,'',0,9400,,'',0,7500,,'',0,11400,,'',0
-'3133',100,75600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93500,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,162900,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,162900,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111302 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111302
index b654740c..1da57459 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111302
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111302
@@ -1,5 +1,5 @@
+'2375',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64100,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5400,,'',0,7500,,'',0,11400,,'',0
-'3133',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93600,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163000,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163000,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111303 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111303
index 07d1393d..bf661505 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111303
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111303
@@ -1,5 +1,5 @@
+'2375',100,75800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5400,,'',0,7500,,'',0,11400,,'',0
-'3133',100,75800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93700,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163100,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163100,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111304 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111304
index 05220f2c..d91a7a9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111304
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111304
@@ -1,5 +1,5 @@
+'2375',100,75900,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5400,,'',0,7500,,'',0,11400,,'',0
-'3133',100,75900,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93800,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163200,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163200,,'',0,19400,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111305
index e4a1a8a9..0de8225d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111305
@@ -1,5 +1,5 @@
+'2375',100,80000,,'',0,5900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5300,,'',0,7500,,'',0,11400,,'',0
-'3133',100,80000,,'',0,5900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93900,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,5900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163300,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163300,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111306 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111306
index 20f5e93d..b6f24fb3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111306
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111306
@@ -1,5 +1,5 @@
+'2375',100,80100,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64400,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5300,,'',0,7500,,'',0,11400,,'',0
-'3133',100,80100,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,94000,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,5800,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163400,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163400,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111322
index 1e41f4b5..c86d0ee9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111322
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111322
@@ -1,5 +1,5 @@
+'2375',301,83500,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83900,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,83500,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,90400,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,151000,,'',0,20000,,'',0
 '3211',301,151000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111323 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111323
index 98b08b4c..a94716b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111323
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111323
@@ -1,13 +1,13 @@
+'2375',101,72100,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55000,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1500,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,10800,,'',0,7500,,'',0,12000,,'',0
-'3133',101,72100,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
 '3201',101,152500,,'',0,19600,,'',0,19000,,'',0,12000,,'',0,10500,,'',0
 '3211',101,152500,,'',0,19600,,'',0,19000,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
+'2375',301,83600,4,'',0,11700,4,'',0,15600,4,'',0,11400,4,'',0,11600,4,'',0,10000,4,'',0,10000,4,'',0,16900,4,'',0,11000,4,'',0,10600,4,'',0
 '3132',301,84000,4,'',0,11400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0,19200,4,'',0,6000,4,'',0,20000,4,'',0,12200,4,'',0
-'3133',301,83600,4,'',0,11700,4,'',0,15600,4,'',0,11400,4,'',0,11600,4,'',0,10000,4,'',0,10000,4,'',0,16900,4,'',0,11000,4,'',0,10600,4,'',0
 '3134',301,90500,4,'',0,19500,4,'',0,10000,4,'',0,14500,4,'',0,10500,4,'',0,18500,4,'',0,10000,4,'',0,10000,4,'',0
 '3201',301,151100,4,'',0,20000,4,'',0
 '3211',301,151100,4,'',0,20000,4,'',0
+'2375',401,84500,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
 '3132',401,85000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10800,,'',0
-'3133',401,84500,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
 '3134',401,91000,,'',0,31500,,'',0,29100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111324
index 46f45962..c78246b5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111324
@@ -1,9 +1,9 @@
+'2375',101,72200,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55100,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1500,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,10800,,'',0,7500,,'',0,12000,,'',0
-'3133',101,72200,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
 '3201',101,152600,,'',0,19600,,'',0,19000,,'',0,12000,,'',0,10500,,'',0
 '3211',101,152600,,'',0,19600,,'',0,19000,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
+'2375',401,84600,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
 '3132',401,85100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10800,,'',0
-'3133',401,84600,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
 '3134',401,91100,,'',0,31500,,'',0,29100,,'',0
 '3264',1501,90300,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111325
index 8b6e7eeb..54508294 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111325
@@ -1,5 +1,5 @@
+'2375',101,72200,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55100,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,10800,,'',0,7500,,'',0,11900,,'',0
-'3133',101,72200,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
 '3201',101,152700,,'',0,19600,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,152700,,'',0,19600,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111326
index 6d4a1bb9..1bcda93c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111326
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111326
@@ -1,5 +1,5 @@
+'2375',101,72300,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55200,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,10800,,'',0,7500,,'',0,11900,,'',0
-'3133',101,72300,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
 '3201',101,152800,,'',0,19600,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,152800,,'',0,19600,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111327
index 94c779a2..7e5d3760 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111327
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111327
@@ -1,5 +1,5 @@
+'2375',301,82600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,83000,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,82600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150100,,'',0,20000,,'',0
 '3211',301,150100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111328
index 9f2e9be7..b3788830 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111328
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111328
@@ -1,5 +1,5 @@
+'2375',301,82700,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,83100,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,82700,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150200,,'',0,20000,,'',0
 '3211',301,150200,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111329
index 28ee88de..810c96e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111329
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111329
@@ -1,5 +1,5 @@
+'2375',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,85700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150300,,'',0,20000,,'',0
 '3211',301,150300,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111330 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111330
index 5c36dc3a..784dbfbc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111330
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111330
@@ -1,5 +1,5 @@
+'2375',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,85800,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150300,,'',0,20000,,'',0
 '3211',301,150300,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111331 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111331
index 2782772f..214d215b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111331
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111331
@@ -1,5 +1,5 @@
+'2375',301,82900,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3132',301,83300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,6000,,'',0,20000,,'',0,12200,,'',0
-'3133',301,82900,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
 '3134',301,85900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,150400,,'',0,20000,,'',0
 '3211',301,150400,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111332 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111332
index 09e55a03..b9442d66 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111332
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111332
@@ -1,4 +1,4 @@
+'2375',401,84800,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
 '3132',401,85300,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10800,,'',0
-'3133',401,84800,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
 '3134',401,91300,,'',0,31500,,'',0,29100,,'',0
 '3264',1501,90500,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111333 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111333
index 16836028..83f9b219 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111333
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111333
@@ -1,3 +1,3 @@
+'2375',401,85000,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
 '3132',401,85500,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10700,,'',0
-'3133',401,85000,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
 '3134',401,91500,,'',0,31500,,'',0,29200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111336
index 424882b8..85df1b04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111336
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111336
@@ -1,5 +1,5 @@
+'2375',401,85500,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,11000,,'',0,10000,,'',0,17200,,'',0,10400,,'',0,10100,,'',0
 '3132',401,90000,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10800,,'',0,10000,,'',0,19000,,'',0,11600,,'',0,10600,,'',0
-'3133',401,85500,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,11000,,'',0,10000,,'',0,17200,,'',0,10400,,'',0,10100,,'',0
 '3134',401,92100,,'',0,31500,,'',0,29200,,'',0
+'2375',1001,85600,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3132',1001,70400,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1001,85600,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111337
index 1a0cd82e..2131c268 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111337
@@ -1,6 +1,6 @@
+'2375',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3132',400,80300,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
-'3133',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3134',400,124100,,'',0,29200,,'',0,38300,,'',0
 '3132',500,80900,0,'Vanier',0,3000,0,'Vanier',0
+'2375',1000,102700,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,80400,,'',0,1000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,102700,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111340
index 55a57dad..b99fdc43 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111340
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111340
@@ -1,4 +1,4 @@
+'2375',400,90700,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3132',400,81000,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
-'3133',400,90700,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3134',400,124800,,'',0,29200,,'',0,38300,,'',0
 '3264',1500,93400,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111347
index dc2a7de0..792f0a97 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111347
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111347
@@ -1,5 +1,5 @@
+'2375',100,80200,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64500,,'',0,7000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,5900,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5300,,'',0,7500,,'',0,11400,,'',0
-'3133',100,80200,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,94200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9800,,'',0,5800,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163600,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163600,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111348
index d335dd2e..4d035aa4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111348
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111348
@@ -1,5 +1,5 @@
+'2375',100,80300,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64600,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,700,,'',0,2300,,'',0,5800,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5300,,'',0,7500,,'',0,11400,,'',0
-'3133',100,80300,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,94200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,5000,,'',0,9900,,'',0
 '3201',100,163600,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163600,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111349
index 07ec08cd..9b01927f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111349
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111349
@@ -1,9 +1,9 @@
+'2375',100,80400,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64700,,'',0,7000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,700,,'',0,2300,,'',0,5800,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,9300,,'',0,3500,,'',0,11400,,'',0
-'3133',100,80400,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,94400,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,5000,,'',0,9900,,'',0
 '3201',100,163800,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163800,,'',0,19300,,'',0,17900,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2375',400,91100,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12200,,'',0,16100,,'',0
 '3132',400,81300,,'',0,10300,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11900,,'',0,15900,,'',0
-'3133',400,91100,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12200,,'',0,16100,,'',0
 '3134',400,125200,,'',0,29200,,'',0,38200,,'',0
 '3264',1500,93600,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111352 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111352
index 4bdf37a9..d5e9f71d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111352
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111352
@@ -1,5 +1,5 @@
+'2375',301,81300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73400,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84300,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,144800,,'',0,20000,,'',0
 '3211',301,144800,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111353 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111353
index 41095aac..8f3385fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111353
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111353
@@ -1,5 +1,5 @@
+'2375',301,81400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73500,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84400,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,144900,,'',0,20000,,'',0
 '3211',301,144900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111355 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111355
index cec5ae81..e53e136e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111355
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111355
@@ -1,5 +1,5 @@
+'2375',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73700,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145100,,'',0,20000,,'',0
 '3211',301,145100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111356 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111356
index cec5ae81..e53e136e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111356
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111356
@@ -1,5 +1,5 @@
+'2375',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73700,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145100,,'',0,20000,,'',0
 '3211',301,145100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111357 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111357
index fde28fd4..704bab24 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111357
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111357
@@ -1,5 +1,5 @@
+'2375',301,81700,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3132',301,73800,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81700,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
 '3134',301,84700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145200,,'',0,20000,,'',0
 '3211',301,145200,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111358 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111358
index 25af95e6..c2b37dde 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111358
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111358
@@ -1,5 +1,5 @@
+'2375',301,81800,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,73900,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81800,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,84800,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145300,,'',0,20000,,'',0
 '3211',301,145300,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111359 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111359
index 94ba5971..807860d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111359
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111359
@@ -1,5 +1,5 @@
+'2375',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74000,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,84900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145400,,'',0,20000,,'',0
 '3211',301,145400,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111360 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111360
index 94ba5971..807860d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111360
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111360
@@ -1,5 +1,5 @@
+'2375',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74000,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,84900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145400,,'',0,20000,,'',0
 '3211',301,145400,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111361 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111361
index 3b7b0539..63a70eec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111361
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111361
@@ -1,5 +1,5 @@
+'2375',301,82000,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74100,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82000,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85000,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145500,,'',0,20000,,'',0
 '3211',301,145500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111362 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111362
index c5483b6d..3461bf63 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111362
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111362
@@ -1,5 +1,5 @@
+'2375',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74200,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145600,,'',0,20000,,'',0
 '3211',301,145600,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111363 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111363
index c5483b6d..3461bf63 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111363
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111363
@@ -1,5 +1,5 @@
+'2375',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74200,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145600,,'',0,20000,,'',0
 '3211',301,145600,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111364 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111364
index ccb7ecb2..2777e0ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111364
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111364
@@ -1,5 +1,5 @@
+'2375',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74300,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145700,,'',0,20000,,'',0
 '3211',301,145700,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111365 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111365
index ccb7ecb2..2777e0ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111365
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111365
@@ -1,5 +1,5 @@
+'2375',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74300,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145700,,'',0,20000,,'',0
 '3211',301,145700,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111366 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111366
index 2be696a8..192e9f67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111366
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111366
@@ -1,5 +1,5 @@
+'2375',301,82300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74400,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85300,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145800,,'',0,20000,,'',0
 '3211',301,145800,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111367 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111367
index 549f0891..7f1fd4f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111367
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111367
@@ -1,6 +1,6 @@
 '3132',101,74600,0,'Downtown',0
+'2375',301,82400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3132',301,74600,4,'',0,8200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,19200,,'',0,2000,,'',0,20000,,'',0,16200,,'',0
-'3133',301,82400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
 '3134',301,85400,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
 '3201',301,145900,,'',0,20000,,'',0
 '3211',301,145900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111368 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111368
index 74aa7c54..5ff4a2cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111368
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111368
@@ -1,5 +1,5 @@
+'2375',101,72400,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55300,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1100,0,'Downtown',0,400,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,14800,,'',0,3500,,'',0,11900,,'',0
-'3133',101,72400,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
 '3201',101,152900,,'',0,19600,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,152900,,'',0,19600,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111369 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111369
index a5050702..8bb3b379 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111369
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111369
@@ -1,5 +1,5 @@
+'2375',101,72500,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,1200,0,'Downtown',0,300,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,12000,,'',0
-'3133',101,72500,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
 '3201',101,153000,,'',0,19500,,'',0,19000,,'',0,12000,,'',0,10500,,'',0
 '3211',101,153000,,'',0,19500,,'',0,19000,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111370 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111370
index 1ba4f0a1..223d6512 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111370
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111370
@@ -1,5 +1,5 @@
+'2375',101,72500,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11900,,'',0
-'3133',101,72500,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,10000,,'',0
 '3201',101,153100,,'',0,19500,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,153100,,'',0,19500,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111371 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111371
index 81ba9c2d..80bcc724 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111371
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111371
@@ -1,5 +1,5 @@
+'2375',101,72500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11800,,'',0
-'3133',101,72500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,9900,,'',0
 '3201',101,153200,,'',0,19500,,'',0,19000,,'',0,11800,,'',0,10500,,'',0
 '3211',101,153200,,'',0,19500,,'',0,19000,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111372 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111372
index 03346046..da125fda 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111372
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111372
@@ -1,5 +1,5 @@
+'2375',101,72700,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55600,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11900,,'',0
-'3133',101,72700,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
 '3201',101,153400,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,153400,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111373 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111373
index f460148c..c5a0fda8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111373
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111373
@@ -1,5 +1,5 @@
+'2375',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,64000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,800,,'',0,2200,,'',0,6000,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,6900,,'',0,5300,,'',0,7500,,'',0,11500,,'',0
-'3133',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93600,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
 '3201',100,163000,,'',0,19300,,'',0,18000,,'',0,12000,,'',0,10500,,'',0
 '3211',100,163000,,'',0,19300,,'',0,18000,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111374 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111374
index edbeee16..33132546 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111374
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111374
@@ -1,5 +1,5 @@
+'2375',101,72700,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55600,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11800,,'',0
-'3133',101,72700,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,9900,,'',0
 '3201',101,153400,,'',0,19500,,'',0,19000,,'',0,11800,,'',0,10500,,'',0
 '3211',101,153400,,'',0,19500,,'',0,19000,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111375 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111375
index 13ee27b7..21a656e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111375
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111375
@@ -1,5 +1,5 @@
+'2375',101,72800,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55700,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11900,,'',0
-'3133',101,72800,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
 '3201',101,153500,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,153500,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111377 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111377
index 91b00d78..1bb0a26a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111377
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111377
@@ -1,5 +1,5 @@
+'2375',101,72900,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55800,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11800,,'',0
-'3133',101,72900,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
 '3201',101,153700,,'',0,19400,,'',0,19000,,'',0,11800,,'',0,10500,,'',0
 '3211',101,153700,,'',0,19400,,'',0,19000,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111378 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111378
index d6b75871..7ef6b65b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111378
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111378
@@ -1,12 +1,12 @@
+'2375',101,73500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
 '3132',101,60300,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,1200,0,'Downtown',0,4300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10700,,'',0,3500,,'',0,15700,,'',0
-'3133',101,73500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
 '3134',101,92100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
 '3201',101,154400,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0
 '3211',101,154400,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2375',601,84200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3132',601,64700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,15000,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'3133',601,84200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3134',601,102700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1101,100900,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
 '3132',1101,73500,,'',0,27300,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39900,,'',0,33000,,'',0
-'3133',1101,100900,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
 '3132',1201,72600,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
 '3132',9901,160900,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111379 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111379
index a08366d1..a5d6a3a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111379
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111379
@@ -1,12 +1,12 @@
+'2375',101,73500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,60400,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5300,0,'Downtown',0,200,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10600,,'',0,3500,,'',0,15800,,'',0
-'3133',101,73500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,92200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
 '3201',101,154500,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0
 '3211',101,154500,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2375',601,84300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3132',601,64800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,15000,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'3133',601,84300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3134',601,102800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1101,101000,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
 '3132',1101,73500,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
-'3133',1101,101000,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
 '3132',1201,72700,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
 '3132',9901,161000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111380 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111380
index fd750b49..fc14a2d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111380
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111380
@@ -1,17 +1,17 @@
+'2375',101,73600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
 '3132',101,60500,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5200,0,'Downtown',0,300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10600,,'',0,3500,,'',0,15800,,'',0
-'3133',101,73600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
 '3134',101,92300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
 '3201',101,154600,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0
 '3211',101,154600,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2375',501,153500,0,'Vanier',0
 '3132',501,82300,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
-'3133',501,153500,0,'Vanier',0
+'2375',601,84400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3132',601,64900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,15000,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'3133',601,84400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3134',601,102900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1101,101000,,'',0,11800,,'',0,39700,,'',0,39900,,'',0,33000,,'',0
 '3132',1101,73600,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
-'3133',1101,101000,,'',0,11800,,'',0,39700,,'',0,39900,,'',0,33000,,'',0
+'2375',1201,125600,,'',0,60000,,'',0
 '3132',1201,72700,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,125600,,'',0,60000,,'',0
 '3205',1301,102600,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,85900,0,'VMP Connector',0
 '3132',9901,161000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111381 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111381
index 6deec145..72353861 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111381
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111381
@@ -1,16 +1,16 @@
+'2375',100,74600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,63100,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9500,,'',0,7500,,'',0,11500,,'',0
-'3133',100,74600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,92500,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,161800,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,161800,,'',0,19600,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2375',500,152400,0,'Vanier',0
 '3132',500,151700,0,'Vanier',0,10400,0,'Vanier',0
-'3133',500,152400,0,'Vanier',0
+'2375',601,81600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,81600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1100,92500,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
 '3132',1100,65600,,'',0,26900,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40300,,'',0,37100,,'',0
-'3133',1100,92500,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
+'2375',1200,113800,,'',0,59900,,'',0
 '3132',1200,60700,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,113800,,'',0,59900,,'',0
 '3205',1301,93800,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,80000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111382 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111382
index 2a754e12..1a6be45b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111382
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111382
@@ -1,2 +1,2 @@
+'2375',1001,85400,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3132',1001,70200,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1001,85400,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111383 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111383
index 77f4e2f5..67484b41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111383
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111383
@@ -1,2 +1,2 @@
+'2375',1000,102800,,'',0,40100,,'',0,40300,,'',0,36800,,'',0
 '3132',1000,80500,,'',0,1000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,35500,,'',0
-'3133',1000,102800,,'',0,40100,,'',0,40300,,'',0,36800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111384 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111384
index 924351fe..668368df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111384
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111384
@@ -1,5 +1,5 @@
+'2375',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3264',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
 '3132',9900,83300,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111385 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111385
index 2ca9ff36..b0fd317b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111385
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111385
@@ -1,5 +1,5 @@
+'2375',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83500,0,'VMP Connector',0
 '3132',9901,153500,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111386 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111386
index 659d0058..899f84db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111386
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111386
@@ -1,5 +1,5 @@
+'2375',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83600,0,'VMP Connector',0
 '3132',9901,153600,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111387 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111387
index 1ca83ecc..1a0b901b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111387
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111387
@@ -1,5 +1,5 @@
+'2375',601,82200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83600,0,'VMP Connector',0
 '3132',9901,153700,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111388 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111388
index e28bc881..c84b2616 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111388
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111388
@@ -1,5 +1,5 @@
+'2375',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83800,0,'VMP Connector',0
 '3132',9901,153800,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111389 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111389
index 5b1d6a49..7edb3f8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111389
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111389
@@ -1,5 +1,5 @@
+'2375',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83900,0,'VMP Connector',0
 '3132',9901,154000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111390 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111390
index ecf5b08c..c7879a39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111390
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111390
@@ -1,5 +1,5 @@
+'2375',601,83500,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64000,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83500,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,82900,0,'VMP Connector',0
 '3132',9901,152900,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111391 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111391
index 5f7742be..a028d5df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111391
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111391
@@ -1,5 +1,5 @@
+'2375',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,82900,0,'VMP Connector',0
 '3132',9901,153000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111392 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111392
index 84d3d343..e2499d1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111392
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111392
@@ -1,5 +1,5 @@
+'2375',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83000,0,'VMP Connector',0
 '3132',9901,153000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111393 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111393
index bc27d61e..1fe8f49d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111393
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111393
@@ -1,5 +1,5 @@
+'2375',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83000,0,'VMP Connector',0
 '3132',9901,153000,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111394 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111394
index f8d8ae2e..5de3bb83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111394
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111394
@@ -1,5 +1,5 @@
+'2375',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83000,0,'VMP Connector',0
 '3132',9901,153100,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111395 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111395
index 14ccbe5d..28522afb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111395
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111395
@@ -1,5 +1,5 @@
+'2375',601,83900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83200,0,'VMP Connector',0
 '3132',9901,153200,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111396 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111396
index 1547bdb3..0f73e424 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111396
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111396
@@ -1,5 +1,5 @@
+'2375',601,84000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3132',601,64500,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,15000,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'3133',601,84000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3134',601,102500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83300,0,'VMP Connector',0
 '3132',9901,153300,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111397 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111397
index ee2fdfa6..965bd535 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111397
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111397
@@ -1,5 +1,5 @@
+'2375',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
+'2375',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,103900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111398 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111398
index a70d0e28..cb4b8e16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111398
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111398
@@ -1,5 +1,5 @@
+'2375',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
+'2375',801,90000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111399 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111399
index 2b9715d6..c494e072 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111399
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111399
@@ -1,5 +1,5 @@
+'2375',701,85000,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,65800,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85000,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
+'2375',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111400 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111400
index 6a233250..4452b9fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111400
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111400
@@ -1,2 +1,2 @@
+'2375',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111401 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111401
index 6a233250..4452b9fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111401
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111401
@@ -1,2 +1,2 @@
+'2375',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111402 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111402
index 84d55ed6..4d467c6d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111402
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111402
@@ -1,2 +1,2 @@
+'2375',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111404 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111404
index b1e84de1..9c7efda0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111404
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111404
@@ -1,5 +1,5 @@
+'2375',701,85500,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70200,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85500,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
+'2375',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111405 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111405
index 9aa6994e..63154905 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111405
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111405
@@ -1,5 +1,5 @@
+'2375',701,85600,,'',0,25100,0,'Arden',0,20700,0,'Arden',0,23500,,'',0,16300,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70200,0,'Arden',0,5100,,'',0,15400,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,12000,,'',0,8200,,'',0,10000,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85600,,'',0,25100,0,'Arden',0,20700,0,'Arden',0,23500,,'',0,16300,0,'Arden',0,33000,0,'Arden',0
+'2375',801,90200,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64800,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90200,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104300,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111406 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111406
index 7f6496e2..a105bd34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111406
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111406
@@ -1,5 +1,5 @@
+'2375',701,85700,,'',0,69300,,'',0
 '3132',701,75400,,'',0,78900,,'',0,8200,,'',0
-'3133',701,85700,,'',0,69300,,'',0
+'2375',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111407 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111407
index 228bb12d..be498c09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111407
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111407
@@ -1,2 +1,2 @@
+'2375',701,90200,,'',0,65300,,'',0
 '3132',701,75900,,'',0,78900,,'',0,8200,,'',0
-'3133',701,90200,,'',0,65300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111408 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111408
index 0310da2a..a87aa626 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111408
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111408
@@ -1,5 +1,5 @@
+'2375',701,90300,,'',0,65300,,'',0
 '3132',701,80000,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90300,,'',0,65300,,'',0
+'2375',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65300,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104800,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111409 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111409
index 2319ba9c..948f9a62 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111409
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111409
@@ -1,5 +1,5 @@
+'2375',701,90300,,'',0,65300,,'',0
 '3132',701,80000,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90300,,'',0,65300,,'',0
+'2375',801,90800,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90800,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111410 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111410
index 3ae50bb1..4eaad0ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111410
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111410
@@ -1,5 +1,5 @@
+'2375',701,90400,,'',0,65300,,'',0
 '3132',701,80100,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90400,,'',0,65300,,'',0
+'2375',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,105000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111411 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111411
index 3ae50bb1..4eaad0ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111411
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111411
@@ -1,5 +1,5 @@
+'2375',701,90400,,'',0,65300,,'',0
 '3132',701,80100,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90400,,'',0,65300,,'',0
+'2375',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,105000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111412 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111412
index c7def461..45a5525a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111412
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111412
@@ -1,3 +1,3 @@
+'2375',800,83500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62600,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94200,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111413 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111413
index dcb797da..3796ff67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111413
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111413
@@ -1,5 +1,5 @@
+'2375',701,90400,,'',0,65300,,'',0
 '3132',701,80100,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90400,,'',0,65300,,'',0
+'2375',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,105100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111414 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111414
index b9d2d671..194c7d95 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111414
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111414
@@ -1,5 +1,5 @@
+'2375',701,90500,,'',0,65300,,'',0
 '3132',701,80200,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90500,,'',0,65300,,'',0
+'2375',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,105100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111415 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111415
index 24eafe95..7a404eb6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111415
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111415
@@ -1,3 +1,3 @@
+'2375',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,103900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111416 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111416
index 6103b840..437cafe2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111416
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111416
@@ -1,3 +1,3 @@
+'2375',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111417 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111417
index 7b0be907..2c2ce883 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111417
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111417
@@ -1,3 +1,3 @@
+'2375',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,63200,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94800,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111418 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111418
index b8e29ae3..9d70acfc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111418
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111418
@@ -1,3 +1,3 @@
+'2375',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111419 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111419
index 404f32f6..30b12c5b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111419
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111419
@@ -1,3 +1,3 @@
+'2375',801,90400,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65000,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90400,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104500,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111420 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111420
index aba471d5..d00fcdac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111420
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111420
@@ -1,3 +1,3 @@
+'2375',801,90500,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65100,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90500,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104600,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111421 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111421
index ca7465c6..9832db07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111421
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111421
@@ -1,3 +1,3 @@
+'2375',801,90600,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65200,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90600,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104700,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111422 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111422
index bdb0fc47..62dda798 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111422
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111422
@@ -1,3 +1,3 @@
+'2375',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65300,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104800,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111423 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111423
index 8bad798a..a3eb5b65 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111423
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111423
@@ -1,3 +1,3 @@
+'2375',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62500,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94100,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111424 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111424
index 10488618..0d21c051 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111424
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111424
@@ -1,3 +1,3 @@
+'2375',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62700,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111425 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111425
index 10488618..0d21c051 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111425
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111425
@@ -1,3 +1,3 @@
+'2375',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62700,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111426 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111426
index 53a717aa..1dd6b0bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111426
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111426
@@ -1,3 +1,3 @@
+'2375',800,83700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62800,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,83700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94400,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111427 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111427
index 2322face..2dfab1b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111427
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111427
@@ -1,3 +1,3 @@
+'2375',800,83800,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62900,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,83800,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111428 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111428
index a5d0e93f..8d032249 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111428
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111428
@@ -1,3 +1,3 @@
+'2375',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,63000,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94600,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111429 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111429
index a5d0e93f..8d032249 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111429
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111429
@@ -1,3 +1,3 @@
+'2375',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,63000,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94600,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111430 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111430
index d864ae87..b4edb434 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111430
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111430
@@ -1,3 +1,3 @@
+'2375',800,84000,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,63100,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,84000,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94700,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111431 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111431
index 7b0be907..2c2ce883 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111431
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111431
@@ -1,3 +1,3 @@
+'2375',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,63200,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,14000,,'',0
-'3133',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94800,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111432 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111432
index 2fccc799..ed325118 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111432
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111432
@@ -1,5 +1,5 @@
+'2375',701,110900,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70400,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,110900,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
+'2375',800,84600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
 '3132',800,63700,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',800,84600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
 '3134',800,95300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111435 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111435
index cf9bf706..a4ae5094 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111435
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111435
@@ -1,4 +1,4 @@
+'2375',1001,91700,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3132',1001,72500,,'',0,7500,,'',0,13000,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,91700,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,39100,,'',0
 '3134',1001,105600,,'',0,68200,,'',0
 '3205',1401,85100,,'',0,25400,,'',0,44600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111437 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111437
index 332b2e56..64a29f1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111437
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111437
@@ -1,3 +1,3 @@
+'2375',1001,92800,0,'Deep Bay -',0,42300,,'',0,38400,0,'Deep Bay -',0,39200,,'',0
 '3132',1001,73700,,'',0,7500,,'',0,13000,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,38300,,'',0
-'3133',1001,92800,0,'Deep Bay -',0,42300,,'',0,38400,0,'Deep Bay -',0,39200,,'',0
 '3134',1001,110800,,'',0,64200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111438 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111438
index 1a43387e..43ac971e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111438
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111438
@@ -1,6 +1,6 @@
+'2375',1000,95800,,'',0,40100,,'',0,44300,,'',0,32800,,'',0
+'2375',1001,135400,4,'',0,77600,4,'',0
 '3132',1000,74500,,'',0,7500,,'',0,19300,,'',0,34600,,'',0,45600,,'',0,31500,,'',0
 '3132',1001,74000,4,'',0,7500,4,'',0,53900,4,'',0,77600,4,'',0
-'3133',1000,95800,,'',0,40100,,'',0,44300,,'',0,32800,,'',0
-'3133',1001,135400,4,'',0,77600,4,'',0
 '3134',1000,111600,0,'Downtown',0,68400,0,'Downtown',0
 '3134',1001,111100,4,'',0,64200,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111442 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111442
index 5816d060..b687d72e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111442
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111442
@@ -1,4 +1,4 @@
+'2375',1000,101600,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,80300,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,101600,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,113400,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90600,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111448 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111448
index 76a40228..04df68de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111448
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111448
@@ -1,4 +1,4 @@
+'2375',1100,93300,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
 '3132',1100,70300,,'',0,23000,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40100,,'',0,37000,,'',0
-'3133',1100,93300,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
 '3205',1301,94600,,'',0,25400,,'',0,44600,,'',0
 '3132',9900,80500,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111449 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111449
index f02ae7da..e48ed0d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111449
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111449
@@ -1,2 +1,2 @@
+'2375',1100,94000,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
 '3132',1100,94000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
-'3133',1100,94000,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111450 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111450
index 8ccbc2fa..abb255b1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111450
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111450
@@ -1,3 +1,3 @@
+'2375',1100,94800,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1100,71500,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'3133',1100,94800,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',9900,81100,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111451 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111451
index 5ebfb5b1..b72c7713 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111451
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111451
@@ -1,3 +1,3 @@
+'2375',1100,94900,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1100,71600,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'3133',1100,94900,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',9900,81200,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111452 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111452
index bb4b71e3..b0e203b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111452
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111452
@@ -1,4 +1,4 @@
+'2375',1100,95300,4,'',0,15800,4,'',0,39700,4,'',0,40000,4,'',0,33000,4,'',0
+'2375',1101,95300,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1100,72000,4,'',0,23300,4,'',0,15800,4,'',0,23700,4,'',0,16000,4,'',0,40000,4,'',0,33000,4,'',0
 '3132',1101,72000,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'3133',1100,95300,4,'',0,15800,4,'',0,39700,4,'',0,40000,4,'',0,33000,4,'',0
-'3133',1101,95300,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111455 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111455
index 2ca9ff36..b0fd317b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111455
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111455
@@ -1,5 +1,5 @@
+'2375',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83500,0,'VMP Connector',0
 '3132',9901,153500,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111456 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111456
index 9cc65e84..6d9b26bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111456
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111456
@@ -1,5 +1,5 @@
+'2375',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3264',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
 '3132',9900,83400,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111457 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111457
index 06172293..9989106c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111457
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111457
@@ -1,2 +1,2 @@
+'2375',701,85200,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70000,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85200,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111459 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111459
index 378563a7..ef347fde 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111459
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111459
@@ -1,6 +1,6 @@
+'2375',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3132',400,80300,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,12000,,'',0,11900,,'',0
-'3133',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
 '3134',400,124100,,'',0,29200,,'',0,38300,,'',0
 '3132',500,80800,0,'Vanier',0,3000,0,'Vanier',0
+'2375',1000,102600,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,80300,,'',0,1000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,102600,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111461 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111461
index f4d50b19..f936d10d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111461
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111461
@@ -1,2 +1,2 @@
+'2375',701,85800,,'',0,69300,,'',0
 '3132',701,75500,,'',0,78900,,'',0,8200,,'',0
-'3133',701,85800,,'',0,69300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111463 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111463
index e79351b7..9547601f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111463
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111463
@@ -1,5 +1,5 @@
+'2375',601,83800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,64300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,15000,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,102300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,83100,0,'VMP Connector',0
 '3132',9901,153100,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111464 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111464
index 84d55ed6..4d467c6d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111464
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111464
@@ -1,2 +1,2 @@
+'2375',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111465 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111465
index 67d3ef9b..fda8b3be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111465
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111465
@@ -1,2 +1,2 @@
+'2375',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111467 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111467
index 228bb12d..be498c09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111467
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111467
@@ -1,2 +1,2 @@
+'2375',701,90200,,'',0,65300,,'',0
 '3132',701,75900,,'',0,78900,,'',0,8200,,'',0
-'3133',701,90200,,'',0,65300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111473 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111473
index 1e958afd..652579c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111473
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111473
@@ -1,5 +1,5 @@
+'2375',601,82000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62500,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3264',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
 '3132',9900,83400,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111474 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111474
index 95b88e44..ab3df215 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111474
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111474
@@ -1,5 +1,5 @@
+'2375',101,74200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,60900,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10500,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,92900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155200,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155200,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111475 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111475
index 79816dfa..24e18108 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111475
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111475
@@ -1,3 +1,3 @@
+'2375',1101,100300,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1101,73000,,'',0,27300,,'',0,11800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'3133',1101,100300,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',9901,160300,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111476 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111476
index 2cc469b2..23ac4131 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111476
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111476
@@ -1,13 +1,13 @@
+'2375',100,75300,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,63700,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,2900,,'',0,9400,,'',0,7500,,'',0,11500,,'',0
-'3133',100,75300,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,162600,,'',0,19400,,'',0,18000,,'',0,12000,,'',0,10500,,'',0
 '3211',100,162600,,'',0,19400,,'',0,18000,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2375',601,83300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,63800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,101800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1100,93200,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
 '3132',1100,70200,,'',0,23000,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40100,,'',0,37000,,'',0
-'3133',1100,93200,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
 '3205',1301,94500,,'',0,21400,,'',0,48600,,'',0
 '3264',1500,92000,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
 '3264',1501,91700,4,'',0,4000,4,'',0,8000,4,'',0,28000,4,'',0,4000,4,'',0,8000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111477 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111477
index a4f651d9..5aca9db6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111477
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111477
@@ -1,5 +1,5 @@
+'2375',100,75400,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3132',100,63800,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,4100,,'',0,6000,,'',0,2100,,'',0,2900,,'',0,9400,,'',0,7500,,'',0,11500,,'',0
-'3133',100,75400,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
 '3134',100,93300,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
 '3201',100,162700,,'',0,19400,,'',0,18000,,'',0,12000,,'',0,10500,,'',0
 '3211',100,162700,,'',0,19400,,'',0,18000,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111478 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111478
index bc2c3ea5..a174154c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111478
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111478
@@ -1,5 +1,5 @@
+'2375',101,72900,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55800,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11900,,'',0
-'3133',101,72900,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
 '3201',101,153600,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,153600,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111480 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111480
index f4f6bbf4..676fadbf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111480
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111480
@@ -1,3 +1,3 @@
+'2375',601,82900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,63400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,101400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111481 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111481
index ed41e7b0..d1116950 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111481
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111481
@@ -1,5 +1,5 @@
+'2375',601,82400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,62900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,100900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '3132',9900,84000,0,'VMP Connector',0
 '3132',9901,154200,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111483 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111483
index 72171e48..8ebf9190 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111483
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111483
@@ -1,4 +1,4 @@
+'2375',1000,101900,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,75600,,'',0,5000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,101900,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3134',1000,113700,0,'Downtown',0,68400,0,'Downtown',0
 '3205',1400,90900,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111486 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111486
index 6a1a0b60..4574e534 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111486
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111486
@@ -1,31 +1,31 @@
 '3132',101,80300,4,'',0
+'2375',500,152300,0,'Vanier',0
+'2375',501,153800,4,'',0
 '3132',500,151600,0,'Vanier',0,10400,0,'Vanier',0
 '3132',501,82600,4,'',0,3000,4,'',0,67500,4,'',0,200,4,'',0,10200,4,'',0
-'3133',500,152300,0,'Vanier',0
-'3133',501,153800,4,'',0
+'2375',601,81500,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,7800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
 '3132',601,62000,,'',0,3200,4,'',0,5800,,'',0,3200,4,'',0,7500,,'',0,3200,4,'',0,7100,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,7300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2300,,'',0,7200,4,'',0,3800,,'',0,7200,4,'',0,2300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
-'3133',601,81500,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,7800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
 '3134',601,100000,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0
+'2375',701,84700,,'',0,25300,0,'Arden',0,1200,4,'',0,19500,0,'Arden',0,1200,4,'',0,22100,,'',0,16500,0,'Arden',0,1200,4,'',0,31800,0,'Arden',0,1200,4,'',0
 '3132',701,65500,0,'Arden',0,5200,4,'',0,3700,,'',0,15600,0,'Arden',0,1200,4,'',0,10300,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,9300,0,'Arden',0,1200,4,'',0,18300,0,'Arden',0,1200,4,'',0,10600,,'',0,8200,,'',0,10200,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,20600,0,'Arden',0,1200,4,'',0
-'3133',701,84700,,'',0,25300,0,'Arden',0,1200,4,'',0,19500,0,'Arden',0,1200,4,'',0,22100,,'',0,16500,0,'Arden',0,1200,4,'',0,31800,0,'Arden',0,1200,4,'',0
+'2375',800,84800,4,'',0,11000,4,'',0,15500,4,'',0,11100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,9900,4,'',0,15500,4,'',0,12000,4,'',0,18000,4,'',0
+'2375',801,85600,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',800,63900,4,'',0,11500,4,'',0,15500,4,'',0,9500,4,'',0,10500,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,10000,4,'',0,9500,4,'',0,9800,4,'',0,10000,4,'',0,9400,4,'',0,11200,4,'',0,18000,4,'',0
 '3132',801,64200,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',800,84800,4,'',0,11000,4,'',0,15500,4,'',0,11100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,9900,4,'',0,15500,4,'',0,12000,4,'',0,18000,4,'',0
-'3133',801,85600,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',800,95500,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0,27500,4,'',0
 '3134',801,103700,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
+'2375',1000,103400,4,'',0,40100,4,'',0,40300,4,'',0,36800,4,'',0
+'2375',1001,85200,0,'Deep Bay -',0,46200,,'',0,34500,0,'Deep Bay -',0,39100,,'',0
 '3132',1000,81100,4,'',0,1000,4,'',0,3500,4,'',0,19300,4,'',0,38600,4,'',0,41600,4,'',0,35500,4,'',0
 '3132',1001,70000,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1000,103400,4,'',0,40100,4,'',0,40300,4,'',0,36800,4,'',0
-'3133',1001,85200,0,'Deep Bay -',0,46200,,'',0,34500,0,'Deep Bay -',0,39100,,'',0
+'2375',1100,92400,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
+'2375',1101,101300,4,'',0,11700,4,'',0,39800,4,'',0,39800,4,'',0,33000,4,'',0
 '3132',1100,65500,,'',0,26900,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40300,,'',0,37100,,'',0
 '3132',1101,73800,4,'',0,27400,4,'',0,11800,4,'',0,27900,4,'',0,12000,4,'',0,39700,4,'',0,33000,4,'',0
-'3133',1100,92400,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
-'3133',1101,101300,4,'',0,11700,4,'',0,39800,4,'',0,39800,4,'',0,33000,4,'',0
+'2375',1200,113700,,'',0,59900,,'',0
+'2375',1201,125900,4,'',0,60000,4,'',0
 '3132',1200,60600,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
 '3132',1201,73000,4,'',0,12500,4,'',0,44700,4,'',0,19800,4,'',0,30000,4,'',0,10200,4,'',0
-'3133',1200,113700,,'',0,59900,,'',0
-'3133',1201,125900,4,'',0,60000,4,'',0
 '3205',1301,93700,,'',0,9200,4,'',0,12200,,'',0,9200,4,'',0,39400,,'',0,9200,4,'',0
 '3205',1400,92400,4,'',0,21400,4,'',0,48700,4,'',0
 '3205',1401,83000,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111488 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111488
index 2cd82362..0cabfa13 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111488
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111488
@@ -1,5 +1,5 @@
+'2375',101,74000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,60800,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10600,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,92700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,5800,,'',0
 '3201',101,155000,,'',0,19300,,'',0,18800,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155000,,'',0,19300,,'',0,18800,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111489 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111489
index 06e15922..f14ed592 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111489
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111489
@@ -1,17 +1,17 @@
+'2375',101,73700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
 '3132',101,60600,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5300,0,'Downtown',0,200,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10600,,'',0,3500,,'',0,15800,,'',0
-'3133',101,73700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
 '3134',101,92400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
 '3201',101,154700,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0
 '3211',101,154700,,'',0,19300,,'',0,18900,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2375',501,153700,0,'Vanier',0
 '3132',501,82500,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
-'3133',501,153700,0,'Vanier',0
+'2375',601,84500,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3132',601,65000,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'3133',601,84500,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
 '3134',601,103000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1101,101200,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
 '3132',1101,73700,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
-'3133',1101,101200,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
+'2375',1201,125800,,'',0,60000,,'',0
 '3132',1201,72900,,'',0,12500,,'',0,44700,,'',0,15800,,'',0,30000,,'',0,14200,,'',0
-'3133',1201,125800,,'',0,60000,,'',0
 '3205',1301,102800,,'',0,21400,,'',0,48600,,'',0
 '3132',9900,90100,0,'VMP Connector',0
 '3132',9901,161200,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111490 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111490
index e82d8e84..9c298229 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111490
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111490
@@ -1,2 +1,2 @@
+'2375',1001,85500,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3132',1001,70300,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1001,85500,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111491 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111491
index 67d3ef9b..fda8b3be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111491
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111491
@@ -1,2 +1,2 @@
+'2375',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111492 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111492
index ba50cd92..8bb28b3f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111492
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111492
@@ -1,3 +1,3 @@
+'2375',1200,114300,,'',0,59900,,'',0
 '3132',1200,61200,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,114300,,'',0,59900,,'',0
 '3132',9901,152600,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111499 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111499
index 7980fa17..6641702a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111499
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111499
@@ -1,5 +1,5 @@
+'2375',401,85600,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10100,,'',0
 '3132',401,90100,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10700,,'',0,10100,,'',0,19000,,'',0,11600,,'',0,10600,,'',0
-'3133',401,85600,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10100,,'',0
 '3134',401,92200,,'',0,31500,,'',0,29200,,'',0
+'2375',1001,85700,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
 '3132',1001,70500,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34300,,'',0
-'3133',1001,85700,0,'Deep Bay -',0,46200,,'',0,38500,0,'Deep Bay -',0,35100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111500 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111500
index f0faeb6e..a8fd9a9b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111500
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111500
@@ -1,4 +1,4 @@
+'2375',200,81900,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,63000,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,81900,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94400,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111501 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111501
index 1b649339..0872d298 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111501
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111501
@@ -1,4 +1,4 @@
+'2375',200,81800,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,62900,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,81800,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94300,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111502 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111502
index 7dadd888..d3456109 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111502
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111502
@@ -1,4 +1,4 @@
+'2375',200,82000,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3132',200,63100,,'',0,8500,,'',0,3000,0,'Comox Mall',0,9500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,11200,,'',0,18000,,'',0
-'3133',200,82000,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
 '3134',200,94500,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,232800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111503 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111503
index 04ca1a1f..a3de1605 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111503
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111503
@@ -1,4 +1,4 @@
+'2375',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',201,62400,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',201,93800,,'',0,77200,,'',0,19400,,'',0
 '3211',201,232100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111504 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111504
index 74b34167..323250b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111504
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111504
@@ -1,4 +1,4 @@
+'2375',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',201,62500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',201,93900,,'',0,77200,,'',0,19400,,'',0
 '3211',201,232200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111505 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111505
index 74b34167..323250b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111505
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111505
@@ -1,4 +1,4 @@
+'2375',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',201,62500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',201,93900,,'',0,77200,,'',0,19400,,'',0
 '3211',201,232200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111506 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111506
index a5caf887..8ee76ea9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111506
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111506
@@ -1,3 +1,3 @@
+'2375',2001,81300,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3132',2001,103400,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,11400,,'',0
-'3133',2001,81300,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
 '3134',2001,131300,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111507 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111507
index 04ca1a1f..a3de1605 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111507
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_111507
@@ -1,4 +1,4 @@
+'2375',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3132',201,62400,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,16300,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
 '3134',201,93800,,'',0,77200,,'',0,19400,,'',0
 '3211',201,232100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_112064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_112064
index a7be581e..ebf3ce07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_112064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_112064
@@ -1,2 +1,2 @@
+'2375',1201,121900,,'',0,60000,,'',0
 '3132',1201,64700,,'',0,16500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,121900,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134002
index 4c53f46c..58f72133 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134002
@@ -1,5 +1,5 @@
+'2375',101,74300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,61000,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10500,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,93000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155300,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155300,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134003
index 66ef099e..ca178383 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134003
@@ -1,5 +1,5 @@
+'2375',701,110800,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
 '3132',701,70300,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'3133',701,110800,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
+'2375',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,64500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,104000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134004
index 824e80cc..1a46c9c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134004
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134004
@@ -1,12 +1,12 @@
+'2375',101,74600,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3132',101,61300,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,10500,,'',0,3500,,'',0,15700,,'',0
-'3133',101,74600,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
 '3134',101,93300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155600,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0
 '3211',101,155600,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2375',701,90500,,'',0,65300,,'',0
 '3132',701,80200,,'',0,74900,,'',0,8200,,'',0
-'3133',701,90500,,'',0,65300,,'',0
+'2375',801,91100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,91100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,105200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
 '3132',1001,74600,,'',0
 '3205',1401,83500,,'',0,100,,'',0,21300,,'',0,100,,'',0,48500,,'',0,100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134005
index 3ff8bdeb..a301714e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134005
@@ -1,10 +1,10 @@
+'2375',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3132',100,62400,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,8100,,'',0,2100,,'',0,6100,,'',0,2900,,'',0,9700,,'',0,7500,,'',0,11500,,'',0
-'3133',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
 '3134',100,91700,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
 '3201',100,160900,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0
 '3211',100,160900,,'',0,19800,,'',0,14000,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
 '3132',200,75800,0,'Comox Mall',0
+'2375',800,83300,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3132',800,62400,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9800,,'',0,10000,,'',0,5400,,'',0,15200,,'',0,14000,,'',0
-'3133',800,83300,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
 '3134',800,94000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
 '3205',1400,91400,,'',0,21400,,'',0,48700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134006
index 155b578a..623faf8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134006
@@ -1,19 +1,19 @@
+'2375',101,74800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,14500,,'',0,10900,,'',0
 '3132',101,61600,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,7200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,10500,,'',0,7500,,'',0,11700,,'',0
-'3133',101,74800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,14500,,'',0,10900,,'',0
 '3134',101,93500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
 '3201',101,155900,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,14500,,'',0
 '3211',101,155900,,'',0,19300,,'',0,18700,,'',0,11800,,'',0,14500,,'',0,10900,,'',0
+'2375',200,83000,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0,19300,,'',0
 '3132',200,64100,,'',0,8500,,'',0,12500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,4000,,'',0,8300,,'',0,3100,,'',0,9400,,'',0,15200,,'',0,14000,,'',0
-'3133',200,83000,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0,19300,,'',0
 '3134',200,95500,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
 '3211',200,233800,,'',0
+'2375',801,91300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3132',801,65900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,14900,,'',0,12500,,'',0,11200,,'',0,18000,,'',0
-'3133',801,91300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
 '3134',801,105400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
+'2375',1001,90200,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,35000,,'',0
 '3132',1001,71000,,'',0,3900,,'',0,16600,0,'Deep Bay -',0,40900,,'',0,39300,0,'Deep Bay -',0,34200,,'',0
-'3133',1001,90200,0,'Deep Bay -',0,42200,,'',0,38500,0,'Deep Bay -',0,35000,,'',0
 '3134',1001,104100,,'',0,68200,,'',0
 '3205',1401,83800,,'',0,21400,,'',0,48600,,'',0
+'2375',2001,75900,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
 '3132',2001,102000,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,17700,,'',0,300,,'',0,11400,,'',0
-'3133',2001,75900,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
 '3134',2001,125900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134007
index eca12be9..883c5691 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134007
@@ -1,2 +1,2 @@
+'2375',1000,102300,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
 '3132',1000,80000,,'',0,1000,,'',0,3500,,'',0,19300,,'',0,38600,,'',0,41600,,'',0,31500,,'',0
-'3133',1000,102300,,'',0,40100,,'',0,40300,,'',0,32800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134010
index 433f02fc..1a7ece9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134010
@@ -1,12 +1,12 @@
+'2375',101,73000,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55900,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,10700,,'',0,3500,,'',0,15800,,'',0
-'3133',101,73000,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
 '3201',101,153800,,'',0,19400,,'',0,19000,,'',0,11800,,'',0,10500,,'',0
 '3211',101,153800,,'',0,19400,,'',0,19000,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2375',601,83100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3132',601,63600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,83100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
 '3134',601,101600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2375',1101,100400,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1101,73100,,'',0,27300,,'',0,11800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'3133',1101,100400,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
 '3132',1201,72100,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
 '3132',9901,160400,0,'VMP Connector',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134012
index 98394765..2f734ccb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134012
@@ -1,3 +1,3 @@
+'2375',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
 '3132',1100,70700,,'',0,23000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
-'3133',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
 '3205',1301,95000,,'',0,25400,,'',0,44600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134013
index c8fbe403..0dcaad44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134013
@@ -1,3 +1,3 @@
+'2375',601,82700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3132',601,63200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,11000,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'3133',601,82700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
 '3134',601,101200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134014
index 3ffe9ef8..10b22fe0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134014
@@ -1,5 +1,5 @@
+'2375',101,72600,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3132',101,55500,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,3200,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,14700,,'',0,3500,,'',0,11900,,'',0
-'3133',101,72600,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
 '3134',101,91100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
 '3201',101,153300,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0
 '3211',101,153300,,'',0,19400,,'',0,19000,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134016
index 8900ae03..a91a041d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134016
@@ -1,2 +1,2 @@
+'2375',1201,124700,,'',0,60000,,'',0
 '3132',1201,71500,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,124700,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134017
index 61233ebd..c3dd1d1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134017
@@ -1,3 +1,3 @@
+'2375',1200,115300,,'',0,59900,,'',0
 '3132',1200,62200,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,115300,,'',0,59900,,'',0
 '3205',1301,100400,,'',0,21400,,'',0,48600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134018
index 70d096ea..35e8e678 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134018
@@ -1,2 +1,2 @@
+'2375',1201,123900,,'',0,60000,,'',0
 '3132',1201,70700,,'',0,12500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1201,123900,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134019
index c2bb45ab..144cf565 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134019
@@ -1,2 +1,2 @@
+'2375',1200,120000,,'',0,55900,,'',0
 '3132',1200,62900,,'',0,12500,,'',0,44600,,'',0,15300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,120000,,'',0,55900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134020
index 99562d5f..00413825 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134020
@@ -1,2 +1,2 @@
+'2375',1200,120200,,'',0,59900,,'',0
 '3132',1200,63100,,'',0,12500,,'',0,44600,,'',0,15300,,'',0,34600,,'',0,10000,,'',0
-'3133',1200,120200,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134021
index 005b96be..c373a6dd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134021
@@ -1,4 +1,4 @@
+'2375',1200,121100,4,'',0,59900,4,'',0
+'2375',1201,121700,,'',0,60000,,'',0
 '3132',1200,64000,4,'',0,16500,4,'',0,40600,4,'',0,19300,4,'',0,30600,4,'',0,10000,4,'',0
 '3132',1201,64500,,'',0,16500,,'',0,40700,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'3133',1200,121100,4,'',0,59900,4,'',0
-'3133',1201,121700,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134023
index d383617d..b146a4ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_134023
@@ -1,2 +1,2 @@
+'2375',1200,114500,,'',0,59900,,'',0
 '3132',1200,61400,,'',0,12500,,'',0,40600,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'3133',1200,114500,,'',0,59900,,'',0
diff --git a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index a62b10d1..eaf5abc6 100644
--- a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
+++ b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
@@ -6,6 +6,6 @@
     <string name="current_gtfs_rts_area_max_lat">49.87338</string>
     <string name="current_gtfs_rts_area_min_lng">-125.14771</string>
     <string name="current_gtfs_rts_area_max_lng">-124.72595</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1725367800</integer><!-- 2024/09/03 05:50:00 PDT -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1725810000</integer><!-- 2024/09/08 08:40:00 PDT -->
     <integer name="current_gtfs_rts_last_departure_in_sec">1733111460</integer><!-- 2024/12/01 19:51:00 PST -->
 </resources>
diff --git a/app-android/src/main/res/values/gtfs_rts_values.xml b/app-android/src/main/res/values/gtfs_rts_values.xml
index 2d349e71..e26c89af 100755
--- a/app-android/src/main/res/values/gtfs_rts_values.xml
+++ b/app-android/src/main/res/values/gtfs_rts_values.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <integer name="gtfs_rts_db_version">20240903</integer>
+    <integer name="gtfs_rts_db_version">20240910</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_comox_valley_transit_system_bus.gtfs</string>
     <string name="gtfs_status_for_poi_authority">@string/gtfs_rts_authority</string>
     <string name="gtfs_rts_contact_us">https://www.bctransit.com/contact</string>