diff --git a/MoreLinq/CompatibilitySuppressions.xml b/MoreLinq/CompatibilitySuppressions.xml
index ead8c1613..ffe9243dc 100644
--- a/MoreLinq/CompatibilitySuppressions.xml
+++ b/MoreLinq/CompatibilitySuppressions.xml
@@ -1,232 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.AppendExtension</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.PrependExtension</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.AppendExtension</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.PrependExtension</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.AppendExtension</Target>
-    <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.PrependExtension</Target>
-    <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.AppendExtension</Target>
-    <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:MoreLinq.Extensions.PrependExtension</Target>
-    <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.Extensions.BatchExtension.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Append``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Concat``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Prepend``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Windowed``1(System.Collections.Generic.IEnumerable{``0},System.Int32)</Target>
-    <Left>lib/net462/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.Extensions.BatchExtension.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Append``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Concat``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Prepend``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Windowed``1(System.Collections.Generic.IEnumerable{``0},System.Int32)</Target>
-    <Left>lib/net6.0/MoreLinq.dll</Left>
-    <Right>lib/net6.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.Extensions.BatchExtension.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
-    <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Append``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
-    <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
+    <Target>M:MoreLinq.MoreEnumerable.SkipLast``1(System.Collections.Generic.IEnumerable{``0},System.Int32)</Target>
     <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Concat``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.TakeLast``1(System.Collections.Generic.IEnumerable{``0},System.Int32)</Target>
     <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Prepend``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.ToHashSet``1(System.Collections.Generic.IEnumerable{``0},System.Collections.Generic.IEqualityComparer{``0})</Target>
     <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Windowed``1(System.Collections.Generic.IEnumerable{``0},System.Int32)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.ToHashSet``1(System.Collections.Generic.IEnumerable{``0})</Target>
     <Left>lib/netstandard2.0/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.0/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.Extensions.BatchExtension.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
+    <Target>M:MoreLinq.MoreEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IEqualityComparer{``1})</Target>
     <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/net6.0/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Append``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
     <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/net6.0/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Batch``2(System.Collections.Generic.IEnumerable{``0},System.Int32,System.Func{System.Collections.Generic.IEnumerable{``0},``1})</Target>
+    <Target>M:MoreLinq.MoreEnumerable.MaxBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IComparer{``1})</Target>
     <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/net6.0/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Concat``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.MaxBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
     <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/net6.0/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Prepend``1(System.Collections.Generic.IEnumerable{``0},``0)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.MinBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IComparer{``1})</Target>
     <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
+    <Right>lib/net6.0/MoreLinq.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:MoreLinq.MoreEnumerable.Windowed``1(System.Collections.Generic.IEnumerable{``0},System.Int32)</Target>
+    <Target>M:MoreLinq.MoreEnumerable.MinBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
     <Left>lib/netstandard2.1/MoreLinq.dll</Left>
-    <Right>lib/netstandard2.1/MoreLinq.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>.NETStandard,Version=v1.0</Target>
+    <Right>lib/net6.0/MoreLinq.dll</Right>
   </Suppression>
 </Suppressions>
diff --git a/MoreLinq/MoreLinq.csproj b/MoreLinq/MoreLinq.csproj
index fea6ba41c..60ebd05e0 100644
--- a/MoreLinq/MoreLinq.csproj
+++ b/MoreLinq/MoreLinq.csproj
@@ -135,7 +135,7 @@
     <PackageOutputPath>..\dist</PackageOutputPath>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>3.4.1</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>4.0.0</PackageValidationBaselineVersion>
     <IncludeSymbols>true</IncludeSymbols>
     <IncludeSource>true</IncludeSource>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>