diff --git a/Pilz/AppVersion.cs b/Pilz/AppVersion.cs
index 09c348c..96a369b 100644
--- a/Pilz/AppVersion.cs
+++ b/Pilz/AppVersion.cs
@@ -1,4 +1,6 @@
 using Newtonsoft.Json;
+using System.Net.Http.Headers;
+using System.Text;
 
 namespace Pilz;
 
@@ -27,10 +29,39 @@ public class AppVersion(Version version, int build, AppChannel channel) : ICompa
 
     public override string ToString()
     {
-        if (Channel == AppChannel.Stable && Build == 1)
-            return Version.ToString();
+        string version = Version.ToString();
 
-        return $"{Version} {Channel} {Build}";
+        if (Channel != AppChannel.Stable || Build != 1)
+            version = $"{version} {Channel} {Build}";
+
+        return version;
+    }
+
+    public virtual string ToString(int fieldCount)
+    {
+        string version = Version.ToString(fieldCount);
+
+        if (Channel != AppChannel.Stable || Build != 1)
+            version = $"{version} {Channel} {Build}";
+
+        return version;
+    }
+
+    public virtual string ToShortString()
+    {
+        string version;
+
+        if (Version.Revision != 0)
+            version = $"{Version.Major}.{Version.Minor}.{Version.Build}.{Version.Revision}";
+        else if (Version.Build != 0)
+            version = $"{Version.Major}.{Version.Minor}.{Version.Build}";
+        else
+            version = $"{Version.Major}.{Version.Minor}";
+
+        if (Channel != AppChannel.Stable || Build != 1)
+            version = $"{version} {Channel} {Build}";
+
+        return version;
     }
 
     public override bool Equals(object obj)
diff --git a/Pilz/Pilz.csproj b/Pilz/Pilz.csproj
index b63ef1e..9361e1d 100644
--- a/Pilz/Pilz.csproj
+++ b/Pilz/Pilz.csproj
@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>annotations</Nullable>
-    <Version>2.3.5</Version>
+    <Version>2.3.6</Version>
   </PropertyGroup>
   
   <ItemGroup>