diff --git a/CRSim.Core/Services/NetworkService.cs b/CRSim.Core/Services/NetworkService.cs
index 1ad1fc1..b782f7e 100644
--- a/CRSim.Core/Services/NetworkService.cs
+++ b/CRSim.Core/Services/NetworkService.cs
@@ -121,15 +121,21 @@ namespace CRSim.Core.Services
                     var startTimeStr = item.GetProperty("start_time").GetString();
                     TimeSpan? arriveTime = null;
                     TimeSpan? startTime = null;
-                    if (arriveTimeStr != "----")
+                    if (item.GetProperty("start_station_name").ToString() != name)
                     {
                         arriveTime = TimeSpan.Parse(arriveTimeStr);
                     }
-                    if (startTimeStr != arriveTimeStr)
+                    if (item.GetProperty("end_station_name").ToString() != name)
                     {
                         startTime = TimeSpan.Parse(startTimeStr);
                     }
-                    trainStops.Add(new TrainStop() { Number = item.GetProperty("station_train_code").ToString(), Terminal = item.GetProperty("end_station_name").ToString(), Origin = item.GetProperty("start_station_name").ToString(), ArrivalTime = arriveTime, DepartureTime = startTime });
+                    trainStops.Add(new TrainStop() 
+                    {
+                        Number = item.GetProperty("station_train_code").ToString(), 
+                        Terminal = item.GetProperty("end_station_name").ToString(), 
+                        Origin = item.GetProperty("start_station_name").ToString(), 
+                        ArrivalTime = arriveTime, 
+                        DepartureTime = startTime });
                 }
                 return trainStops;
             }
diff --git a/CRSim.PlatformDiagram/CRSim.PlatformDiagram.csproj b/CRSim.PlatformDiagram/CRSim.PlatformDiagram.csproj
index 6dfb882..2d8f204 100644
--- a/CRSim.PlatformDiagram/CRSim.PlatformDiagram.csproj
+++ b/CRSim.PlatformDiagram/CRSim.PlatformDiagram.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="itext" Version="9.4.0" />
     <PackageReference Include="itext.bouncy-castle-adapter" Version="9.4.0" />
     <PackageReference Include="itext.font-asian" Version="9.4.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CRSim.sln b/CRSim.sln
index f0c2e8b..47393fc 100644
--- a/CRSim.sln
+++ b/CRSim.sln
@@ -34,6 +34,7 @@ Global
 		{895EE8B3-1A15-4CA8-9AFE-246585732AA5}.Debug|x64.ActiveCfg = Debug|x64
 		{895EE8B3-1A15-4CA8-9AFE-246585732AA5}.Debug|x64.Build.0 = Debug|x64
 		{895EE8B3-1A15-4CA8-9AFE-246585732AA5}.Release|x64.ActiveCfg = Release|x64
+		{895EE8B3-1A15-4CA8-9AFE-246585732AA5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CRSim/CRSim.csproj b/CRSim/CRSim.csproj
index f14fed8..10c8c93 100644
--- a/CRSim/CRSim.csproj
+++ b/CRSim/CRSim.csproj
@@ -5,8 +5,8 @@
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <RootNamespace>CRSim</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64;ARM64;AnyCPU</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <Platforms>x64;AnyCPU</Platforms>
+    <RuntimeIdentifiers>win-x64;</RuntimeIdentifiers>
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
@@ -44,7 +44,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-    <PackageReference Include="CRSim.WebsiteSimulator" Version="3.1.3" />
+    <PackageReference Include="CRSim.WebsiteSimulator" Version="3.1.5" />
     <PackageReference Include="EPPlus" Version="8.3.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
diff --git a/CRSim/Properties/PublishProfiles/win-x64.pubxml b/CRSim/Properties/PublishProfiles/win-x64.pubxml
index ac2fbba..2c0043b 100644
--- a/CRSim/Properties/PublishProfiles/win-x64.pubxml
+++ b/CRSim/Properties/PublishProfiles/win-x64.pubxml
@@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 	<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <SelfContained>false</SelfContained>
     <Configuration>Release</Configuration>
-    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
     <PublishSingleFile>false</PublishSingleFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file