diff --git a/Path.json b/Path.json
index 0dc2a410..9ccc8200 100644
--- a/Path.json
+++ b/Path.json
@@ -44200,7 +44200,7 @@
 			]
 		},
 		{
-			"electrified": true,
+			"electrified": false,
 			"group": 0,
 			"maxSpeed": 120,
 			"twistingFactor": 0.25,
@@ -95092,6 +95092,54 @@
 					"length": 8
 				}
 			]
+		},
+		{
+			"name": "Hegyeshalom-Bratislava",
+			"electrified": true,
+			"group": 0,
+			"twistingFactor": 0.2,
+			"objects": [
+				{
+					"start": "XMHY",
+					"end": "XYBZ",
+					"maxSpeed": 100,
+					"length": 28
+				},
+				{
+					"start": "XYBZ",
+					"end": "XYB",
+					"maxSpeed": 60,
+					"length": 18
+				}
+			]
+		},
+		{
+			"name": "Lowicz-Skierniewice",
+			"electrified": true,
+			"group": 0,
+			"twistingFactor": 0.1,
+			"objects": [
+				{
+					"start": "XPLZ",
+					"end": "XPSW",
+					"maxSpeed": 100,
+					"length": 22
+				}
+			]
+		},
+		{
+			"name": "Csorna-Hegyeshalom",
+			"electrified": true,
+			"group": 0,
+			"twistingFactor": 0.1,
+			"objects": [
+				{
+					"start": "🇭🇺O93800925",
+					"end": "XMHY",
+					"maxSpeed": 100,
+					"length": 38
+				}
+			]
 		}
 	]
 }
\ No newline at end of file
diff --git a/Station.json b/Station.json
index f49ece42..242dc4e0 100644
--- a/Station.json
+++ b/Station.json
@@ -87239,7 +87239,7 @@
 		{
 			"name": "Cornaux",
 			"ril100": "XSCO",
-			"group": 5,
+			"group": 2,
 			"x": 59,
 			"y": 786,
 			"platformLength": 220,
@@ -106833,6 +106833,16 @@
 			"y": 534,
 			"platformLength": 80,
 			"proj": 3
+		},
+		{
+			"group": 2,
+			"name": "Bratislava-Petržalka",
+			"ril100": "XYBZ",
+			"x": 1464,
+			"y": 615,
+			"proj": 3,
+			"platformLength": 500,
+			"platforms": 3
 		}
 	]
 }
diff --git a/TaskModel.json b/TaskModel.json
index 5e923ed5..2b5554bc 100644
--- a/TaskModel.json
+++ b/TaskModel.json
@@ -1611,8 +1611,12 @@
 			"objects": [
 				{
 					"stations": [ "NN", "NALB", "MKIG", "MIH", "MRBI", "MPF", "MPE", "MH", "MA", "TU", "TE", "TV", "RK", "XFSTG", "XFSV", "XFRM", "XFMZV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XKAI", "XKLP" ],
-					"pathSuggestion": [ "NN", "NALB", "MKIG", "MIH", "MRBI", "MPF", "MPE", "MDA", "MH", "MP", "MMR", "MA", "MGZB", "TU", "TAM", "TG", "TP", "TE", "TS", "TV", "RBR", "RK", "RRA", "RAP", "XFSTG", "XFVH", "XFMH", "XFSV", "XFRD", "🇫🇷BDC", "XFRM", "XFMZV", "XFTHV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XFFE", "XKAI", "XKLP" ]
+					"pathSuggestion": [ "NN", "NALB", "MKIG", "MIH", "MRBI", "MPF", "MPE", "MDA", "MH", "MMR", "MA", "MGZB", "TU", "TAM", "TG", "TP", "TE", "TS", "TV", "RBR", "RK", "RRA", "RAP", "XFSTG", "XFVH", "XFMH", "XFSV", "XFRD", "🇫🇷BDC", "XFRM", "XFMZV", "XFTHV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XFFE", "XKAI", "XKLP" ]
 				},
+				{
+					"stations": [ "MH", "MA", "TU", "TE", "TV", "RK", "XFSTG", "XFSV", "XFRM", "XFMZV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XKAI", "XKLP" ],
+					"pathSuggestion": [ "MH", "MMR", "MA", "MGZB", "TU", "TAM", "TG", "TP", "TE", "TS", "TV", "RBR", "RK", "RRA", "RAP", "XFSTG", "XFVH", "XFMH", "XFSV", "XFRD", "XFBTM", "🇫🇷BDC", "XFRM", "XFMZV", "XFTHV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XFFE", "XKAI", "XKLP" ]
+        },
 				{
 					"stations": [ "MH", "MA", "TU", "TE", "TV", "RK", "XFSTG", "XFSV", "XFRM", "XFMZV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XKAI", "XKLP" ],
 					"pathSuggestion": [ "MH", "MP", "MMR", "MA", "MGZB", "TU", "TAM", "TG", "TP", "TE", "TS", "TV", "RBR", "RK", "RRA", "RAP", "XFSTG", "XFVH", "XFMH", "XFSV", "XFRD", "🇫🇷BDC", "XFRM", "XFMZV", "XFTHV", "XFHA", "XFLGN", "🇫🇷SED", "🇫🇷MNH", "🇫🇷HIQ", "XFFMI", "XFAVN", "XFVA", "XFLIE", "XFFE", "XKAI", "XKLP" ]
@@ -2053,22 +2057,28 @@
 			"service": 11,
 			"objects": [
 				{
-					"stations": [ "XFSTG", "🇫🇷SNA" ]
+					"stations": [ "XFSTG", "🇫🇷SNA" ],
+					"pathSuggestion": [ "XFSTG", "XFVH", "XFMH", "XFRD", "XFBTM", "🇫🇷BDC", "XFMZV", "XFPS", "XFLE", "XFCM", "XFCT", "XFVAR", "XFPO", "XFOL", "🇫🇷TO", "XFSUD", "XFASL", "XFNA", "🇫🇷SNY", "🇫🇷SNA" ]
 				},
 				{
-					"stations": [ "XFSTG", "🇫🇷TO", "XEIR" ]
+					"stations": [ "XFSTG", "🇫🇷TO", "XEIR" ],
+					"pathSuggestion": [ "XFSTG", "XFVH", "XFMH", "XFRD", "XFBTM", "🇫🇷BDC", "XFMZV", "XFPS", "XFLE", "XFCM", "XFCT", "XFVAR", "XFPO", "XFOL", "🇫🇷TO", "🇫🇷MSD", "🇫🇷MAX", "XFCRT", "XFPT", "🇫🇷VIV", "🇫🇷LXC", "XFANG", "🇫🇷O11799452820", "XFCOU", "🇫🇷LIB", "XFBJ", "🇫🇷FAT", "XFMCX", "XFDX", "XFBY", "XEIR" ]
 				},
 				{
-					"stations": [ "XFSTG", "XFHV" ]
+					"stations": [ "XFSTG", "XFHV" ],
+					"pathSuggestion": [ "XFSTG", "XFVH", "XFMH", "XFRD", "XFBTM", "🇫🇷BDC", "XFMZV", "XFPS", "XFLE", "XFCM", "XFCT", "XFVAR", "XFPO", "🇫🇷RRD", "XFHV" ]
 				},
 				{
-					"stations": [ "RM", "🇫🇷SNA" ]
+					"stations": [ "RM", "🇫🇷SNA" ],
+					"pathSuggestion": [ "RM", "RSD", "RN", "SHY", "SKL", "SLD", "SHO", "SRO", "SSH", "XFBE", "🇫🇷BDC", "XFMZV", "XFPS", "XFLE", "XFCM", "XFCT", "XFVAR", "XFPO", "XFOL", "🇫🇷TO", "XFSUD", "XFASL", "XFNA", "🇫🇷SNY", "🇫🇷SNA" ]
 				},
 				{
-					"stations": [ "RM", "XFPO", "XEIR" ]
+					"stations": [ "RM", "XFPO", "XEIR" ],
+					"pathSuggestion": [ "RM", "RSD", "RN", "SHY", "SKL", "SLD", "SHO", "SRO", "SSH", "XFBE", "🇫🇷BDC", "XFMZV", "XFPS", "XFLE", "XFCM", "XFCT", "XFVAR", "XFPO", "XFOL", "🇫🇷TO", "🇫🇷MSD", "🇫🇷MAX", "XFCRT", "XFPT", "🇫🇷VIV", "🇫🇷LXC", "XFANG", "🇫🇷O11799452820", "XFCOU", "🇫🇷LIB", "XFBJ", "🇫🇷FAT", "XFMCX", "XFDX", "XFBY", "XEIR" ]
 				},
 				{
-					"stations": [ "RM", "XFHV" ]
+					"stations": [ "RM", "XFHV" ],
+					"pathSuggestion": [ "RM", "RSD", "RN", "SHY", "SKL", "SLD", "SHO", "SRO", "SSH", "XFBE", "🇫🇷BDC", "XFMZV", "XFPS", "XFLE", "XFCM", "XFCT", "XFVAR", "XFPO", "🇫🇷RRD", "XFHV" ]
 				},
 				{
 					"stations": [ "XFMZV", "XFBJ" ]
@@ -2137,19 +2147,24 @@
 			],
 			"objects": [
 				{
-					"stations": [ "XAG", "XZKO" ]
+					"stations": [ "XAG", "XZKO" ],
+					"pathSuggestion": [ "XAG", "XASS", "XZPG", "XZCE", "XZZM", "XZL", "XZPV", "XZDV", "XZPN", "XZKO" ]
 				},
 				{
-					"stations": [ "XMG", "XZKO" ]
+					"stations": [ "XMG", "XZKO" ],
+					"pathSuggestion": [ "XMG", "XZHO", "XZO", "XZPG", "XZCE", "XZZM", "XZL", "XZPV", "XZDV", "XZPN", "XZKO" ]
 				},
 				{
-					"stations": [ "MH", "XZKO" ]
+					"stations": [ "MH", "XZKO" ],
+					"pathSuggestion": [ "MH", "MGB", "MRO", "MTS", "MFL", "XASB", "XABO", "XASW", "XAVH", "XZJ", "XZL", "XZPV", "XZDV", "XZPN", "XZKO" ]
 				},
 				{
-					"stations": [ "XZNM", "XZKO" ]
+					"stations": [ "XZNM", "XZKO" ],
+					"pathSuggestion": [ "XZNM", "XZTR", "XZGS", "XZL", "XZPV", "XZDV", "XZPN", "XZKO" ]
 				},
 				{
-					"stations": [ "XZNM", "XFSTG" ]
+					"stations": [ "XFSTG", "XZNM" ],
+					"pathSuggestion": [ "XFSTG", "RAP", "RRA", "RMU", "RK", "TPH", "TM", "TV", "TSA", "TBM", "TLU", "TKH", "TS", "TE", "TP", "TGO", "TAM", "TU", "MGZB", "MA", "MMR", "MH", "MGB", "MRO", "MTS", "MFL", "XASB", "XABO", "XASW", "XAVH", "XZJ", "XZL", "XZGS", "XZTR", "XZNM" ]
 				}
 			],
 			"neededCapacity": [
@@ -9977,7 +9992,7 @@
 					"stations": [ "XPWW", "🇵🇱WRT", "🇵🇱TUZ", "🇵🇱LOW" ]
 				},
 				{
-					"stations": [ "XPWW", "XPWZ", "🇵🇱O634988100" ]
+					"stations": [ "XPWW", "XPWZ", "XPSW", "🇵🇱O634988100" ]
 				},
 				{
 					"stations": [ "🇵🇱07331", "🇵🇱O3713836050", "🇵🇱O634988100" ]
@@ -13656,7 +13671,11 @@
 				},
 				{
 					"stations": [ "TKH", "XAVH" ],
-					"pathSuggestion": [ "TKH", "TS", "TP", "TAM", "TU", "MGZB", "MA", "MMR", "MP", "MH", "MGB", "MRO", "MTS", "MFL", "XASB", "XABO", "XASW", "XAVH" ]
+					"pathSuggestion": [ "TKH", "TS", "TP", "TAM", "TU", "MGZB", "MA", "MMR", "MH", "MGB", "MRO", "MTS", "MFL", "XASB", "XABO", "XASW", "XAVH" ]
+				},
+				{
+					"stations": [ "XZKO", "XMHY", "XTOH" ],
+					"pathSuggestion": [ "XZKO", "XZPN", "XZDV", "XZPV", "XZL", "XZZM", "XZCE", "XZPG", "XZO", "XZHO", "XMZV", "🇭🇺O93800925", "XMHY", "XYB", "XYDN", "XYKU", "XTBE", "XTBR", "XTPR", "XTHM", "🇨🇿33654", "XTOH" ]
 				}
 			],
 			"neededCapacity": [
@@ -13719,6 +13738,10 @@
 				{
 					"stations": [ "AHAR", "SDL" ],
 					"pathSuggestion": [ "AHAR", "ABLZ", "AROG", "HV", "HNBG", "HM", "HL", "EHFD", "EBILP", "ERDW", "EHM", "EUN", "EHG", "KW", "KSO", "KK", "KT", "KNE", "KKO", "SBY", "STR", "SKZ", "SDL" ]
+				},
+				{
+					"stations": [ "XAL", "XZKO" ],
+					"pathSuggestion": [ "XAL", "XAWE", "XAAT", "XASF", "XASB", "XABO", "XASW", "XAVH", "XZJ", "XZL", "XZPV", "XZDV", "XZPN", "XZKO" ]
 				}
 			],
 			"neededCapacity": [
@@ -13736,6 +13759,10 @@
 				{
 					"stations": [ "XTPZ", "MGA" ],
 					"pathSuggestion": [ "XTPZ", "NSCH", "NRH", "NOT", "MLA", "MNR", "MMF", "MGA" ]
+				},
+				{
+					"stations": [ "XZKO", "🇸🇮O838627770" ],
+					"pathSuggestion": [ "XZKO", "XZPN", "XZDV", "XZS", "🇸🇮O1864393414", "🇸🇮O838627770" ]
 				}
 			],
 			"neededCapacity": [
@@ -13839,16 +13866,20 @@
 			],
 			"objects": [
 				{
-					"stations": [ "XZKO", "XZL", "XAG" ]
+					"stations": [ "XZKO", "XZL", "XAG" ],
+					"pathSuggestion": [ "XZKO", "XZPN", "XZDV", "XZPV", "XZL", "XZZM", "XZCE", "XZPG", "XASS", "XAG" ]
 				},
 				{
-					"stations": [ "XZKO", "XAVH" ]
+					"stations": [ "XZKO", "XAVH" ],
+					"pathSuggestion": [ "XZKO", "XZPN", "XZDV", "XZPV", "XZL", "XZJ", "XAVH" ]
 				},
 				{
-					"stations": [ "XRR", "XRZ", "XMBK" ]
+					"stations": [ "XRR", "XRZ", "XMBK" ],
+					"pathSuggestion": [ "XRR", "XROT", "XRKA", "XRZ", "XRDS", "XMGY", "XMBK" ]
 				},
 				{
-					"stations": [ "XRR", "XJBC" ]
+					"stations": [ "XRR", "XJBC" ],
+					"pathSuggestion": [ "XRR", "XROT", "XRKA", "XRZ", "XRSV", "XJBC" ]
 				}
 			],
 			"neededCapacity": [
@@ -14749,6 +14780,123 @@
 			"neededCapacity": [
 				{ "name": "passengers" }
 			]
+		},
+		{
+			"group": 1,
+			"name": "SLOVAK EXPRES Tatran von %s nach %s",
+			"service": 1,
+			"descriptions": [
+				"Der Tatran ist der wichtigste Schnellzug in der Slowakei.",
+				"Bringe die Fahrgäste im SLOVAK EXPRES von %s nach %s."
+			],
+			"objects": [
+				{
+					"stations": [ "XYB", "XYTRN", "XYTRE", "XYPU", "XYZ", "XYVU", "XYRU", "XYLIM", "XYPT", "XYSN", "XYMC", "XYKY", "XYK" ],
+					"pathSuggestion": [ "XYB", "XYTRN", "XYTRE", "XYPU", "XYZ", "XYVU", "XYRU", "XYLIM", "XYPT", "XYSN", "XYMC", "XYKY", "XYK" ]
+				},
+				{
+					"stations": [ "XYK", "XYKY", "XYMC", "XYSN", "XYPT", "XYLIM", "XYRU", "XYVU", "XYZ", "XYPU", "XYTRE", "XYTRN", "XYB" ],
+					"pathSuggestion": [ "XYK", "XYKY", "XYMC", "XYSN", "XYPT", "XYLIM", "XYRU", "XYVU", "XYZ", "XYPU", "XYTRE", "XYTRN", "XYB" ]
+				}
+			],
+			"neededCapacity": [
+				{ "name": "passengers" }
+			]
+		},
+		{
+			"group": 1,
+			"name": "RB74 von %s nach %s",
+			"service": 2,
+			"descriptions": [
+				"Fahre eine Regionalbahn der Linie 74 von %s nach %s.",
+				"Bring deine Fahrgäste pünktlich auf der Nagoldtalbahn nach %2$s!",
+				"Fahre einen Zug der Linie RB74 von %s nach %s. Halte dabei an jeder Station."
+			],
+			"objects": [
+				{
+					"stations": [ "TPH", "TPB", "THF", "TET", "THB", "TT" ],
+					"stopsEverywhere": true
+				},
+				{
+					"stations": [ "TPH", "TPB", "TNA M" ],
+					"descriptions": [
+						"Fahre einen verkürzten Verstärkerzug der Linie RB74 nach %2$s.",
+						"Bring deine Fahrgäste pünktlich auf der Nagoldtalbahn nach %2$s!",
+						"Fahre einen Zug der Linie RB74 von %s nach %s. Halte dabei an jeder Station."
+					],
+					"stopsEverywhere": true
+				}
+			],
+			"neededCapacity": [
+				{ "name": "passengers" }
+			]
+		},
+		{
+			"group": 0,
+			"name": "Neue Seidenstrasse von %s nach %s",
+			"service": 11,
+			"descriptions": [
+				"Fahre die neue Seidenstrasse zwischen Duisburg und der weissrussischen Grenze"
+			],
+			"objects": [
+				{
+					"stations": [ "🇵🇱O3456253848", "EDG" ],
+					"pathSuggestion": [ "🇵🇱O3456253848", "🇵🇱WRT", "XPWW", "XPWZ", "XPLZ", "XPPG", "XPR", "BFP", "BFUW", "BL", "BPD", "LB", "LM", "HBS", "HLER", "HH", "HWUN", "HM", "HL", "EHFD", "EBILP", "ERDW", "EHM", "EDO", "EBO", "EE", "EDG" ]
+				}
+			],
+			"neededCapacity": [
+				{ "name": "containers", "value": 45 }
+			]
+		},
+		{
+			"group": 0,
+			"name": "Redbullzug von %s nach %s",
+			"service": 11,
+			"descriptions": [
+				"Fahre Dosen zwischen Bludenz und der Nordsee"
+			],
+			"objects": [
+				{
+					"stations": [ "XABL", "HBHL" ],
+					"pathSuggestion": [ "XABL", "XAFK", "XAB", "MLIR", "TAU", "TLW", "TU", "TAM", "TP", "TS", "TKH", "TLU", "TBM", "TSA", "TV", "TM", "TMW", "RBT", "RBR", "RH", "RMF", "RWE", "FD", "FF", "FG", "FTS", "FWAB", "FGTH", "FKW", "FHMD", "HEBG", "HG", "HN", "HK", "HELZ", "HH", "HWUN", "HNBG", "HV", "HB", "HBH", "HBHL" ]
+				},
+				{
+					"stations": [ "XABL", "HBHL" ],
+					"pathSuggestion": [ "XABL", "XAFK", "XAB", "MLIR", "TAU", "TLW", "TU", "TAM", "TP", "TS", "TKH", "TLU", "TBM", "TH", "TBF", "TO", "TL", "NWH", "NGM", "NBN", "FSTZ", "FFD", "FFU", "FB", "HEBG", "HG", "HN", "HK", "HELZ", "HH", "HWUN", "HNBG", "HV", "HB", "HBH", "HBHL" ]
+				},
+				{
+					"stations": [ "XABL", "HBHL" ],
+					"pathSuggestion": [ "XABL", "XAFK", "XSBU", "XSSR", "XSZB", "XSPF", "XSWW", "XSTW", "XSZH", "XSKS", "XSBA", "XSBRU", "XSB", "RB", "RML", "RF", "RDZ", "RRL", "RO", "RAP", "RRA", "RK", "RBR", "RH", "RMF", "RWE", "FD", "FF", "FG", "FTS", "FWAB", "FGTH", "FKW", "FHMD", "HEBG", "HG", "HN", "HK", "HELZ", "HH", "HWUN", "HNBG", "HV", "HB", "HBH", "HBHL" ]
+				}
+			],
+			"neededCapacity": [
+				{ "name": "containers", "value": 41 }
+			]
+		},
+		{
+			"group": 0,
+			"name": "Conti von %s nach %s",
+			"service": 11,
+			"descriptions": [
+				"Fahre einen Containerzug von %s nach %s"
+			],
+			"objects": [
+				{
+					"stations": [ "XZKO", "XYB", "🇨🇿33654" ],
+					"pathSuggestion": [ "XZKO", "XZPN", "XZDV", "XZPV", "XZL", "XZZM", "XZCE", "XZPG", "XZO", "XZHO", "XMZV", "🇭🇺O93800925", "XMHY", "XYB", "XYDN", "XYKU", "XTBE", "XTBR", "XTPR", "XTHM", "🇨🇿33654" ]
+				},
+				{
+					"stations": [ "XPPR", "EDG" ],
+					"pathSuggestion": [ "XPPR", "XPSW", "XPLZ", "XPPG", "XPR", "BFP", "BFUW", "BL", "BPD", "LB", "LM", "HBS", "HLER", "HH", "HWUN", "HM", "HL", "EHFD", "EBILP", "ERDW", "EHM", "EDO", "EBO", "EE", "EDG" ]
+				},
+				{
+					"stations": [ "XZKO", "XMG" ],
+					"pathSuggestion": [ "XZKO", "XZPN", "XZDV", "XZPV", "XZL", "XZZM", "XZCE", "XZPG", "XZO", "XZHO", "XMZV", "🇭🇺O93800925", "XMG" ]
+				}
+			],
+			"neededCapacity": [
+				{ "name": "containers", "value": 41 }
+			]
 		}
 	]
 }
\ No newline at end of file