diff --git a/pis/auto-dgp2-2024-11-02_21-08-59.yaml b/pis/auto-dgp2-2024-11-02_21-08-59.yaml
deleted file mode 100644
index f5b5823..0000000
--- a/pis/auto-dgp2-2024-11-02_21-08-59.yaml
+++ /dev/null
@@ -1,248 +0,0 @@
-# File produced by DGP2
-
-- code: 6499
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2O09
-    # diagram_time1: 18.44
-    # diagram_time2: 18.34
-
-  stops: gcr,shu,std,kem,swi,cpm,mkm,tro,wsb
-  # stpIndicator: O
-  # trainUid: G44115
-  # scheduleStart: 2024-10-28T00:00:00.000Z
-  # scheduleEnd: 2024-10-31T23:59:59.000Z
-  # daysRun: M,T,W,TH
-  # trainStartTime: 1750
-
-
-- code: 6182
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2T13
-    # diagram_time1: 10.30
-    # diagram_time2: 10.25
-
-  stops: exm,lym,top,nco,dig,exc,exd,ext,mbt,scs,dww,dwl,tgm,nta,trr,tqy,pgn
-  # stpIndicator: P
-  # trainUid: G43923
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 0957
-
-  # stpIndicator: P
-  # trainUid: G44071
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1129
-
-
-- code: 6051
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2K05
-    # diagram_time1: 10.37
-    # diagram_time2: 10.34
-
-  stops: exc,exd,ntc,cdi,oke
-  # stpIndicator: P
-  # trainUid: G44166
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1032
-
-  #stops: svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri
-  # stpIndicator: P
-  # trainUid: G45231
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 0701
-
-
-- code: 6089
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2T29
-    # diagram_time1: 17.56
-    # diagram_time2: None
-
-  stops: exm,lym,lyc,exn,top,nco,dig,pol,sjp,exc,exd,ext,scs,dww,dwl,tgm,nta,trr,tqy,pgn
-  # stpIndicator: P
-  # trainUid: G43924
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1756
-
-
-- code: 5351
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2B84
-    # diagram_time1: 19.22
-    # diagram_time2: 19.19
-
-  #stops: bne,coo,fzp,mai
-  # stpIndicator: P
-  # trainUid: G16617
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1652
-
-  stops: exc,exd,ntc,cdi,yeo,cop,mrd,egg,umb,bnp
-  # stpIndicator: P
-  # trainUid: G45005
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1917
-
-
-- code: 6293
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2T31
-    # diagram_time1: 19.30
-    # diagram_time2: 19.26
-
-  stops: exm,lym,top,nco,dig,exc,exd,ext,mbt,scs,dwl,tgm,nta,trr,tqy,pgn
-  # stpIndicator: P
-  # trainUid: G44111
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1856
-
- # stops: nby,kit,hgd,bdw
-  # stpIndicator: P
-  # trainUid: G44127
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 2049
-
-
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 1D91
-    # diagram_time1: 19.30
-    # diagram_time2: None
-
-
-
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2E30
-    # diagram_time1: 21.00
-    # diagram_time2: None
-
-  #stops: pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,men,sgm,sts,ply,ivy,tot,nta,exd
-  # stpIndicator: P
-  # trainUid: G44173
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 2100
-
-
-- code: 6310
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2C66
-    # diagram_time1: 23.48
-    # diagram_time2: None
-
-  stops: bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd
-  # stpIndicator: P
-  # trainUid: G45476
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-12T23:59:59.000Z
-  # daysRun: M,T,W,TH
-  # trainStartTime: 2348
-
-
-- code: 6205
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2T04
-    # diagram_time1: 05.58
-    # diagram_time2: None
-
-  stops: exd,ext,mbt,scs,dww,dwl,tgm,nta,trr,tqy,pgn
-  # stpIndicator: P
-  # trainUid: G43918
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 0558
-
-
-- code: 6292
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2F32
-    # diagram_time1: 19.15
-    # diagram_time2: None
-
-  stops: pgn,tqy,trr,nta,tgm,dwl,dww,mbt,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm
-  # stpIndicator: P
-  # trainUid: G45114
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-12T23:59:59.000Z
-  # daysRun: M,T,W,TH
-  # trainStartTime: 1915
-
-
-- code: 5352
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2B82
-    # diagram_time1: 17.19
-    # diagram_time2: 17.17
-
-  #stops: bne,mlw
-  # stpIndicator: P
-  # trainUid: G16615
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1652
-
-  stops: exc,exd,ntc,cdi,yeo,cop,mrd,lap,egg,kgn,pma,umb,cpn,bnp
-  # stpIndicator: P
-  # trainUid: G44413
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 1715
-
-
-- code: 5488
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2C97
-    # diagram_time1: 23.05
-    # diagram_time2: 22.54
-
-  stops: bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd
-  # stpIndicator: P
-  # trainUid: G45072
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 2305
-
-
-
-    # diagramDate: 2024-10-29 00:00:00
-    # diagramHeadcode: 2B85
-    # diagram_time1: 20.23
-    # diagram_time2: 20.21
-
-  #stops: exc,exd,cdi,yeo,cop,mrd,egg,umb,bnp
-  # stpIndicator: P
-  # trainUid: G44439
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 2019
-
- # stops: mai,fzp,coo,bne,mlw
-  # stpIndicator: P
-  # trainUid: G45088
-  # scheduleStart: 2024-06-02T23:00:00.000Z
-  # scheduleEnd: 2024-12-13T23:59:59.000Z
-  # daysRun: M,T,W,TH,F
-  # trainStartTime: 2036
diff --git a/pis/gw.yaml b/pis/gw.yaml
index 263e917..2c998a4 100644
--- a/pis/gw.yaml
+++ b/pis/gw.yaml
@@ -4969,16 +4969,16 @@ pis:
     toc: "gw"
   - code: "8008"
     stops: [pad,rdg,tau,exd,nta,ply,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
-    toc: "gw"
+    toc: "hx"
   - code: "9801"
     stops: [pad,hxx,hwv]
-    toc: "gw"
+    toc: "hx"
   - code: "9802"
     stops: [hxx,hwv]
-    toc: "gw"
+    toc: "hx"
   - code: "9811"
     stops: [hwv,hxx,pad]
-    toc: "gw"
+    toc: "hx"
   - code: "9812"
     stops: [hwv,hxx]
-    toc: "gw"
+    toc: "hx"
diff --git a/scripts/merge-yaml.js b/scripts/merge-yaml.js
index 1dc522e..b4df399 100644
--- a/scripts/merge-yaml.js
+++ b/scripts/merge-yaml.js
@@ -39,7 +39,7 @@ function sortAndMergeYAMLFiles() {
             if (item.stops.length > 0) {
                 outputString += `  - code: "${item.code}"\n`;
                 outputString += `    stops: [${item.stops.map(stop => `${stop}`).join(',')}]\n`;
-                outputString += `    toc: "gw"\n`;
+                outputString += `    toc: "${item.toc || "gw"}"\n`;
             }
         });
 
@@ -52,7 +52,7 @@ function sortAndMergeYAMLFiles() {
 
         // Remove any files created by dgp2
         files.forEach(file => {
-            if (file.startsWith('auto-dgp2')) {
+            if (file.startsWith('auto-')) {
                 fs.unlinkSync(directoryPath + file);
                 console.log(`Deleted file: ${file}`);
             }