diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index fe39c54..c15fbd4 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -785,6 +785,100 @@ pis:
     stops: [sjp,exc,exd,ext,dwl,tgm,nta,trr,tqy,pgn]
   - code: 5388
     stops: [sjp,exc,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
+  - code: 5389
+    stops: [bnp,cpn,umb,kgn,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc]
+  - code: 5390
+    stops: [bnp,cpn,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc]
+  - code: 5391
+    stops: [bnp,cpn,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc]
+  - code: 5392
+    stops: [bnp,umb,egg,cop,yeo,cdi,exd,exc]
+  - code: 5393
+    stops: [bnp,umb,egg,cop,yeo,cdi,ntc,exd,exc]
+  - code: 5394
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd,exc]
+  - code: 5395
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,ntc,exd,exc]
+  - code: 5396
+    stops: [bnp,cpn,umb,kgn,egg,lap,mrd,cop,yeo,cdi,ntc,exd]
+  - code: 5397
+    stops: [bnp,cpn,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,ntc,exd]
+  - code: 5398
+    stops: [bnp,egg,cdi,exd]
+  - code: 5399
+    stops: [bnp,umb,egg,cop,yeo,cdi,exd]
+  - code: 5400
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,ntc,exd]
+  - code: 5401
+    stops: [bnp,cpn,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc,stj,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5402
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd,exc,dig,nco,top,lyc,lym,exm]
+  - code: 5403
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd,exc,dig,nco,top,lym,exm]
+  - code: 5404
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd,exc,sjp,dig,nco,top,lyc,lym,exm]
+  - code: 5405
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,ntc,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5406
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,ntc,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5407
+    stops: [bnp,umb,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc,dig,nco,top,lym,exm]
+  - code: 5408
+    stops: [bnp,umb,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5409
+    stops: [bnp,umb,kgn,egg,mrd,cop,yeo,cdi,exd,exc,dig,nco,top,lym,exm]
+  - code: 5410
+    stops: [bnp,umb,kgn,egg,mrd,cop,yeo,cdi,exd,exc,sjp,dig,nco,top,lyc,lym,exm]
+  - code: 5411
+    stops: [bnp,umb,pma,egg,lap,mrd,cop,yeo,cdi,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5412
+    stops: [bnp,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5413
+    stops: [bnp,cpn,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc,sjp]
+  - code: 5414
+    stops: [exc,dig,nco,top,lym,exm]
+  - code: 5415
+    stops: [exc,pol,dig,nco,top,lym,exm]
+  - code: 5416
+    stops: [exd,exc]
+  - code: 5417
+    stops: [exd,exc,dig,nco,top,lym,exm]
+  - code: 5418
+    stops: [exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5419
+    stops: [exd,exc,sjp]
+  - code: 5420
+    stops: [oke,smc,cdi,exd]
+  - code: 5421
+    stops: [oke,smc,cdi,exd,exc,sjp]
+  - code: 4242
+    stops: [pgn,tqy,nta,tgm,dwl,exd,exc]
+  - code: 4423
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc]
+  - code: 5424
+    stops: [pgn,tqy,nta,tgm,dwl,dww,exd]
+  - code: 5425
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,exd,exc]
+  - code: 5426
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd]
+  - code: 5427
+    stops: [pgn,tqy,trr,nta,tgm,dwl,exd]
+  - code: 5428
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5429
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,dig,nco,top,lym,exm]
+  - code: 5430
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,pol,dig,nco,top,lym,exm]
+  - code: 5431
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5432
+    stops: [pgn,tqy,trr,nta,tgm,dwl,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5433
+    stops: [pgn,tqy,trr,nta]
+  - code: 5434
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd,exc,dig,nco,top,lym,exm]
+  - code: 5435
+    stops: [bnp,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
   - code: 5436
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5437
@@ -811,6 +905,8 @@ pis:
     stops: [exc,exd,dwl,tgm,nta,tqy,pgn]
   - code: 5454
     stops: [exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,bpw]
+  - code: 5455
+    stops: [exd,exc,pol,dig,nco,top,lym,exm]
   - code: 5456
     stops: [exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5457
@@ -835,6 +931,10 @@ pis:
     stops: [gcr,cdu,yae,bpw,fit,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,ypm,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5465
     stops: [gcr,cdu,yae,bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5466
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: 5467
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
   - code: 5468
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,tgm,swl,exd,tau,bwt,hig,wsm,wor,yat,nls,bri]
   - code: 5469
@@ -1059,6 +1159,10 @@ pis:
     stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,pwy,stj,nwp,cdf]
   - code: 5584
     stops: [btn,gmv] ### Not in use, intermediate stops omitted
+  - code: 5585
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,ntc,exd,exc]
+  - code: 5586
+    stops: [bnp,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: 5587
     stops: [bri,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
   - code: 5588
@@ -1093,6 +1197,8 @@ pis:
     stops: [gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
   - code: 5603
     stops: [gmv,btn] ### Not in use, intermediate stops omitted
+  - code: 5604
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,exd,exc,dig,nco,top,lyc,lym,exm]
   - code: 5605
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,tgm,dwl,exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,psn,bri]
   - code: 5606
@@ -1179,6 +1285,8 @@ pis:
     stops: [wsm,wnm,wor,yat,nls,bmt,bri,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,ypm,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5651
     stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,stj,nwp,cdf]
+  - code: 5652
+    stops: [bnp,umb,pma,egg,cop,yeo,cdi,exd,exc]
   - code: 5653
     stops: [bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos]
   - code: 5654
@@ -1197,6 +1305,10 @@ pis:
     stops: [exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5665
     stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,stj,nwp,cdf]
+  - code: 5666
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,exd,exc,dig,nco,top,exm,lyc,lym,exm]
+  - code: 5667
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,dig,nco,top,exm,lyc,lym,exm]
   - code: 5668
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,men,sgm,sts,ply,ivy,tot,nta,exd,tvp,tau,bri]
   - code: 5669
@@ -1229,12 +1341,36 @@ pis:
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,ypm,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5683
     stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5685
+    stops: [bnp,umb,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc,sjp]
+  - code: 5686
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd,exc,sjp]
+  - code: 5687
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,ntc,exd,exc,sjp]
+  - code: 5688
+    stops: [bnp,umb,pma,egg,mrd,cop,yeo,cdi,exd,exc,sjp]
   - code: 5689
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5690
     stops: [bth,olf,kyn,bri]
   - code: 5691
     stops: [btn,bpw] ### Not in Use, intermediate stops omitted
+  - code: 5692
+    stops: [bnp,umb,egg,mrd,cop,yeo,cdi,exd]
+  - code: 5693
+    stops: [bnp,cpn,umb,kgn,egg,lap,mrd,cop,yeo,cdn,ntc,exd,exc,sjp]
+  - code: 5694
+    stops: [bnp,cpn,umb,pma,egg,lap,mrd,cop,yeo,cdn,ntc,exd,exc,sjp]
+  - code: 5695
+    stops: [bnp,cpn,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdn,exd,exc,sjp]
+  - code: 5696
+    stops: [bnp,umb,egg,lap,mrd,cop,yeo,cdi,exd,exc,sjp]
+  - code: 5697
+    stops: [bnp,umb,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc,sjp]
+  - code: 5698
+    stops: [bnp,umb,kgn,egg,mrd,cop,yeo,cdi,exd,exc,sjp]
+  - code: 5699
+    stops: [bnp,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc,sjp]
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 5700
@@ -1299,6 +1435,12 @@ pis:
     stops: [lsk,sgm,sts,sbf,ply]
   - code: 5741
     stops: [loo,sdp,cau,skn,coe,lsk]
+  - code: 5742
+    stops: [pgn,tqy,trr,nta,tgm,dwl,ext,exd]
+  - code: 5743
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,exd,exc,dig,nco,top,lym,exm]
+  - code: 5744
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,dig,nco,top,lyc,lym,exm]
   - code: 5745
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,tgm,dwl,dww,exd,tvp,tau,wsm,bri]
   - code: 5746
@@ -1415,6 +1557,8 @@ pis:
     stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
   - code: 5790
     stops: [lsk,sgm,sts,ply]
+  - code: 5791
+    stops: [pgn,tqy,trr,nta,tgm,dwl,dww,scs,ext,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
   - code: 5792
     stops: [lsk,sts,sbf,ply]
   - code: 5793
@@ -1451,6 +1595,8 @@ pis:
     stops: [pmh,pms,ftn,frm,esl,soa,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri]
   - code: 5810
     stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw,yae,cdu,gcr]
+  - code: 5811
+    stops: [bri,wsm,hig,bwt,tau,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exmS]
   - code: 5812
     stops: [bri,yat,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,dpt,doc,key,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5813
@@ -1469,12 +1615,24 @@ pis:
     stops: [exm,lym,top,nco,dig,pol,exc,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: 5821
     stops: [exc,exd,cdi,yeo,cop,mrd,egg,umb,bnp]
+  - code: 5822
+    stops: [bnp,umb,kgn,egg,mrd,cop,yeo,cdi,exd,exc]
   - code: 5823
     stops: [exc,exd,cdi,yeo,cop,mrd,lap,egg,umb,bnp]
+  - code: 5824
+    stops: [bnp,umb,egg,lap,mrd,cop,yeo,cdi,exd,exc]
   - code: 5825
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,dpt,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5826
+    stops: [bnp,cpn,umb,pma,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc]
+  - code: 5827
+    stops: [bnp,umb,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc]
   - code: 5828
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,tgm,dwl,dww,exd]
+  - code: 5829
+    stops: [bnp,umb,pma,egg,mrd,cop,yeo,cdi,ntc,exd]
+  - code: 5830
+    stops: [bnp,umb,pma,egg,mrd,cop,yeo,cdi,ntc,exd,exc]
   - code: 5831
     stops: [exd,tvp,tau,bwt,wsm,bri]
   - code: 5832
@@ -1586,13 +1744,15 @@ pis:
   - code: 5988
     stops: [tru,prw,pyn,pnm,fal]
   - code: 5889
-    stops: [exm,lyn,lyc,exn,top,nco,dig,pol,sjp,exc,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
+    stops: [exm,lym,lyc,exn,top,nco,dig,pol,sjp,exc,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: 5878
     stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5879
     stops: [bri,kyn,olf,bth,boa,tro,wsb,fro,clc,yvp,mdn,dcw,upw,wey]
   - code: 5887
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,tgm,dwl,dww,exd,tvp,tau,wsm,bri]
+  - code: 5888
+    stops: [bnp,umb,pma,kgn,egg,lap,mrd,cop,yeo,cdi,exd,exc]
   - code: 5890
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,men,sgm,sts,key,doc,dvp,ply,ivy,tot,nta,exd,tau,bwt,hig,wsm,wor,yat,nls,bri]
   - code: 5891
@@ -1883,6 +2043,14 @@ pis:
     stops: [cdf,nwp,stj,pwy,bpw,fit,srd,lwh,bri]
   - code: 6045
     stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri]
+  - code: 6046
+    stops: [oke,cdi,exd,exc]
+  - code: 6047
+    stops: [oke,cdi,ntc,exd,exc]
+  - code: 6048
+    stops: [oke,cdi,exd]
+  - code: 6049
+    stops: [oke,cdi,ntc,exd]
   - code: 6050
     stops: [exc,exd,cdi,oke]
   - code: 6051
@@ -1957,6 +2125,8 @@ pis:
     stops: [exm,lym,lyc,exn,top,nco,dig,pol,sjp,exc,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: 6090
     stops: [exm,lym,top,nco,dig,stj,exc,exd,ntc,cdi,yeo,cop,mrd,lap,egg,kgn,umb,bnp]
+  - code: 6091
+    stops: [bnp,umb,kgn,egg,mrd,cop,yeo,cdi,exd]
   - code: 6092
     stops: [exd,tau,bwt,hig,wsm,wor,yat,nls,bri,fit,pwy,stj,nwp,cdf]
   - code: 6093
@@ -1999,6 +2169,8 @@ pis:
     stops: [bri,kyn,olf,bth,boa,tro,wsb]
   - code: 6112
     stops: [exc,exd,tvp,tau,bwt,hig,wsm,bri]
+  - code: 6113
+    stops: [bnp,umb,pma,egg,mrd,cop,yeo,cdi,exd]
   - code: 6114
     stops: [bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ptc,csa,ftn]
   - code: 6115
@@ -2055,6 +2227,8 @@ pis:
     stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
   - code: 6141
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: 6142
+    stops: [bnp,umb,egg,lap,mrd,cop,yeo,cdi,ntc,exd,exc]
   - code: 6143
     stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,lsk,men,sgm,sts,ply,ivy,tot,nta,tgm,dwl,exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,fit,pwy,stj,nwp,cdf]
   - code: 9801
@@ -2066,7 +2240,6 @@ pis:
   - code: 9812
     stops: [hwv,hxx]
 
-###          5586 - (Up BNP-PGN)
 ###          8001 - (Up Sleeper)
 ###          8003 - (Dn Sleeper)
 ###          All LTV
\ No newline at end of file