diff --git a/app/src/main/java/com/dougkeen/bart/model/Line.java b/app/src/main/java/com/dougkeen/bart/model/Line.java
index a22bbfd..6437fc7 100644
--- a/app/src/main/java/com/dougkeen/bart/model/Line.java
+++ b/app/src/main/java/com/dougkeen/bart/model/Line.java
@@ -14,7 +14,7 @@ public enum Line {
             Station.EMBR, Station.WOAK, Station._12TH, Station._19TH,
             Station.MCAR, Station.ASHB, Station.DBRK, Station.NBRK,
             Station.PLZA, Station.DELN, Station.RICH),
-    ORANGE(false, Station.FRMT, Station.UCTY, Station.SHAY, Station.HAYW,
+    ORANGE(false, Station.WARM, Station.FRMT, Station.UCTY, Station.SHAY, Station.HAYW,
             Station.BAYF, Station.SANL, Station.COLS, Station.FTVL,
             Station.LAKE, Station._12TH, Station._19TH, Station.MCAR,
             Station.ASHB, Station.DBRK, Station.NBRK, Station.PLZA,
@@ -35,7 +35,7 @@ public enum Line {
             Station._16TH, Station.CIVC, Station.POWL, Station.MONT,
             Station.EMBR, Station.WOAK, Station.LAKE, Station.FTVL,
             Station.COLS, Station.SANL, Station.BAYF, Station.HAYW,
-            Station.SHAY, Station.UCTY, Station.FRMT),
+            Station.SHAY, Station.UCTY, Station.FRMT, Station.WARM),
     YELLOW_ORANGE_SCHEDULED_TRANSFER(YELLOW, ORANGE, Station.MLBR,
             Station.SFIA, Station.SBRN, Station.SSAN, Station.COLM,
             Station.DALY, Station.BALB, Station.GLEN, Station._24TH,
diff --git a/app/src/main/java/com/dougkeen/bart/model/Station.java b/app/src/main/java/com/dougkeen/bart/model/Station.java
index b0ede9a..952c0e9 100644
--- a/app/src/main/java/com/dougkeen/bart/model/Station.java
+++ b/app/src/main/java/com/dougkeen/bart/model/Station.java
@@ -30,7 +30,7 @@ public enum Station {
             "mcar"),
     PLZA("plza", "El Cerrito Plaza", "El Cer/Plz", false, false, "mcar", "mcar"),
     EMBR("embr", "Embarcadero", "Embarcdro", false, false),
-    FRMT("frmt", "Fremont", "Fremont", true, true, "bayf", "bayf", true, 299999),
+    FRMT("frmt", "Fremont", "Fremont", true, false, "bayf", "bayf"),
     FTVL("ftvl", "Fruitvale", "Fruitvale", true, false, "mcar", "mcar"),
     GLEN("glen", "Glen Park", "Glen Park", false, false),
     HAYW("hayw", "Hayward", "Hayward", true, false, "bayf", "bayf"),
@@ -59,6 +59,7 @@ public enum Station {
     SSAN("ssan", "South San Francisco", "S San Fran", false, false, "balb",
             "balb"),
     UCTY("ucty", "Union City", "Union City", true, false, "bayf", "bayf"),
+    WARM("warm", "Warm Springs/S Fremont", "Warm Springs", true, true, "bayf", "bayf", true, 299999),
     WCRK("wcrk", "Walnut Creek", "Walnut Crk", false, false, "mcar", "mcar"),
     WDUB("wdub", "West Dublin/Pleasanton", "W Dbln/Plsntn", false, false,
             "bayf", "bayf"),