diff --git a/Windream/Windream.vb b/Windream/Windream.vb
index c2380c38..93bb1785 100644
--- a/Windream/Windream.vb
+++ b/Windream/Windream.vb
@@ -1510,27 +1510,11 @@ Public Class Windream
             Return False
         End Try
     End Function
-    Public Function VersionWMFilename(pPath As String, pExt As String)
-        Return _fileSystem.GetVersionedFilename(pPath)
 
-        'Dim rNewFilepath As String = pPath
-        'pPath = GetNormalizedPath(pPath)
-        'Dim oPath = pPath.Substring(0, pPath.LastIndexOf("\"))
-        'Dim oFilename = pPath.Substring(pPath.LastIndexOf("\") + 1, pPath.Length - pPath.LastIndexOf("\") - 1)
-        'Dim oCheck = oFilename
-        'Dim oSplit As List(Of String) = oFilename.Split("~").ToList()
-        'oFilename = oFilename.Replace(pExt, "")
-        'Dim oCount As Integer = 2
-        'Do While TestFileExists(rNewFilepath) = True
-        '    oFilename = oFilename.Replace(pExt, "")
-        '    Dim oVersion = "~" + (oCount - 1).ToString
-        '    oFilename = oFilename.Replace(oVersion, "")
-        '    oFilename = oFilename & "~" & oCount & pExt
-        '    oCount += 1
-        '    rNewFilepath = oPath + "\" + oFilename
-        'Loop
-        'Return rNewFilepath
+    Public Function VersionWMFilename(pPath As String, pExt As String)
+        Return _fileSystem.GetVersionedFilenameWithFilecheck(pPath, AddressOf TestFileExists)
     End Function
+
     Public Function TestFolderExists(Path As String) As Boolean
         Return TestObjectExists(GetNormalizedPath(Path, False), WMEntityFolder)
     End Function