diff --git a/pis/gwr/gwr.yaml b/pis/gw.yaml
similarity index 99%
rename from pis/gwr/gwr.yaml
rename to pis/gw.yaml
index 62660f6..5fb5a77 100644
--- a/pis/gwr/gwr.yaml
+++ b/pis/gw.yaml
@@ -2264,7 +2264,7 @@ pis:
   - code: 6182
     stops: [exd,ext,mbt,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: 6184
-    stops: [exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,mbt,ext,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
   - code: 6187
     stops: [exd,mbt,dwl,tgm,nta,trr,tqy,pgn]
   - code: 6189
@@ -2288,7 +2288,7 @@ pis:
   - code: 6229
     stops: [gcr,yae,bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 6230
-    stops: [wey,upw,dcw,mdn,cno,yrt,tho,yvp,clc,bru,fro,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw,yae,gcr]
+    stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw,yae,gcr]
   - code: 6231
     stops: [gcr,yae,bpw,fit,bri,kyn,olf,bth,boa,tro,wsb]
   - code: 6232
@@ -2309,8 +2309,4 @@ pis:
     stops: [wsb,dmh,wmn,sal]
   - code: 6257
     stops: [gcr,yae,bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,fro]
-
-  ## Non Passenger Codes
-  - code: 0015
-    stops: [xxx,notINservice,xxx]
-###          All LTV
\ No newline at end of file
+###          All LTV