diff --git a/README.md b/README.md
index f8b3ef6..05c9382 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,20 @@
-The Fastest Mouse Clicker for Windows v2.5.3.3
-----------------------------------------------
+The Fastest Mouse Clicker for Windows version 2.5.4.0
+-----------------------------------------------------
 
-[Official Site](https://windows-2048.github.io/The-Fastest-Mouse-Clicker-for-Windows/)
-------------------------------------------------------------------------------------------
+[Official Site](https://windows-2048.github.io/The-Fastest-Mouse-Clicker-for-Windows/){:target="_blank"}
+--------------------------------------------------------------------------------------------------------
 
-### The latest version 2.5.3.3 - Jul 15 2020
+### The latest version 2.5.4.0 - Aug 01 2020
 
 * BRAND NEW Group App to record/play sequences of clicks!
 * Fixed Help text to reflect brand new 'Run group app' button.
 * Fixed 'Can't stop the clicking' bug.
 * Few tiny bug fixes
 * Few fixes in Windows Installer
+* IMPORTANT! Fixed clicking speed degradation at high clicking rates
 
 ## Downloads
 
-Download Windows installer: [Install_TheFastestMouseClicker_2.5.3.3.exe](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.3.3.exe?inline=false)
+Download Windows installer: [Install_TheFastestMouseClicker_2.5.4.0.exe](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.4.0.exe?inline=false)
 
-SHA256(Install_TheFastestMouseClicker_2.5.3.3.exe)= 55bde08c90989d4dbeb9602d93b3c7bcb3645135281e1b64c32d59521799836b
+SHA256(Install_TheFastestMouseClicker_2.5.4.0.exe)= 738058b7dc1e95b963860e5797bab5761a8801bda90feb0311c038e98477cc31
diff --git a/TheFastestMouseGroupClicker/AutoClickerDlg.cpp b/TheFastestMouseGroupClicker/AutoClickerDlg.cpp
index 9683690..2a2260a 100644
--- a/TheFastestMouseGroupClicker/AutoClickerDlg.cpp
+++ b/TheFastestMouseGroupClicker/AutoClickerDlg.cpp
@@ -17,7 +17,7 @@ static char THIS_FILE[] = __FILE__;
 /////////////////////////////////////////////////////////////////////////////
 // CAboutDlg dialog used for App About
 HHOOK	hHook=NULL;
-CString strProgName="The Fastest Mouse Group Clicker v2.5.3.3";
+CString strProgName="The Fastest Mouse Group Clicker v2.5.4.0";
 class CAboutDlg : public CDialog
 {
 public:
diff --git a/__Installer1updater.iss b/__Installer1updater.iss
index f32d2ea..3981db1 100644
--- a/__Installer1updater.iss
+++ b/__Installer1updater.iss
@@ -2,8 +2,8 @@
 
 [Setup]
 AppName=The Fastest Mouse Clicker for Windows
-AppVersion=2.5.3.3
-VersionInfoVersion=2.5.3.3
+AppVersion=2.5.4.0
+VersionInfoVersion=2.5.4.0
 AppPublisher=Open Source Developer Masha Novedad
 AppPublisherURL=https://github.com/windows-2048
 AppUpdatesURL=https://sourceforge.net/projects/fast-mouse-clicker-pro/
@@ -22,15 +22,15 @@ AlwaysShowGroupOnReadyPage=yes
 WizardImageFile=_wizardimage.bmp
 WizardSmallImageFile=_wizardimagesmall.bmp
 #ifnexist "_DEBUG"
-OutputBaseFilename=Install_TheFastestMouseClicker_2.5.3.3
+OutputBaseFilename=Install_TheFastestMouseClicker_2.5.4.0
 #else
-OutputBaseFilename=Install_TheFastestMouseClicker_2.5.3.3d
+OutputBaseFilename=Install_TheFastestMouseClicker_2.5.4.0d
 #endif
 CloseApplications=force
 SetupMutex=Setup_TheFastestMouseClicker
 DirExistsWarning=no
 Encryption=yes
-Password=2.5.3.3
+Password=2.5.4.0
 
 [Dirs]
 ; Note it only removes dir if it is empty after automatic file uninstalling done
@@ -372,8 +372,8 @@ begin
   if CurPageID = wpPassword then
   begin
     WizardForm.PasswordLabel.Caption := 'Just click the Next button.'
-    WizardForm.PasswordEditLabel.Caption := 'Password 2.5.3.3 is already entered.'
-    WizardForm.PasswordEdit.Text := '2.5.3.3'
+    WizardForm.PasswordEditLabel.Caption := 'Password 2.5.4.0 is already entered.'
+    WizardForm.PasswordEdit.Text := '2.5.4.0'
   end;
 end;
 
@@ -400,5 +400,5 @@ Type: filesandordirs; Name: "{app}\TheFastestMouseClicker"
 Type: filesandordirs; Name: "{userappdata}\osdmnuu_dir"
 
 [CustomMessages]
-AppName=The Fastest Mouse Clicker for Windows version 2.5.3.3
+AppName=The Fastest Mouse Clicker for Windows version 2.5.4.0
 LaunchProgram=Start application after finishing installation
diff --git a/docs/README.md b/docs/README.md
index a988dc7..fca3cde 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,18 +1,19 @@
 ## The Fastest Mouse Clicker for Windows
 
-### [Official Download](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.3.3.exe?inline=false) - The latest version 2.5.3.3 - Jul 15 2020
+### [Official Download](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.4.0.exe?inline=false) - The latest version 2.5.4.0 - Aug 01 2020
 
 ### Free and fast, open source, full-featured, statically-linked mouse auto clicker for Windows written in vanilla C++. Uses hardware-limited arrayed Win32 <code><a href="https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-sendinput" target="_blank">SendInput()</a></code> calls to reach up to 100000 clicks/s. Supports command line, random clicks and sequences of clicks (since v.2.5.3.2).
 
 Please update your links: URL <span style="color:orange">https://sourceforge.net/projects/fast-mouse-clicker-pro/ is obsolete</span> and points to the wrong location. Official site is here.
 
-### What's New - The latest version 2.5.3.3 - Jul 15 2020
+### What's New - The latest version 2.5.4.0 - Aug 01 2020
 
 * BRAND NEW Group App to record/play sequences of clicks!
 * Fixed Help text to reflect brand new 'Run group app' button.
 * Fixed 'Can't stop the clicking' bug.
 * Few tiny bug fixes
 * Few fixes in Windows Installer
+* IMPORTANT! Fixed clicking speed degradation at high clicking rates
 
 ## Introduction
 
@@ -172,7 +173,7 @@ and [Gitlab](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windo
 
 ## Screenshots
 
-### Updated for the latest version 2.5.3.3
+### For version 2.5.3.3. The latest version is 2.5.4.0
 
 * The Fastest Mouse Clicker for Windows version 2.5.x.x: introduce the "Run group app" button.
 
@@ -216,6 +217,10 @@ and [Gitlab](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windo
 
 ## Download all the official releases
 
+* Aug 01 2020 - Windows installer (32/64-bit): [Install_TheFastestMouseClicker_2.5.4.0.exe](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.4.0.exe?inline=false)
+
+SHA256(Install_TheFastestMouseClicker_2.5.4.0.exe)= 738058b7dc1e95b963860e5797bab5761a8801bda90feb0311c038e98477cc31
+
 * Jul 15 2020 - Windows installer (32/64-bit): [Install_TheFastestMouseClicker_2.5.3.3.exe](https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.3.3.exe?inline=false)
 
 SHA256(Install_TheFastestMouseClicker_2.5.3.3.exe)= 55bde08c90989d4dbeb9602d93b3c7bcb3645135281e1b64c32d59521799836b
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 55570bb..db6e24d 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -42,7 +42,7 @@
 "description":"Official Download for free and fast, open source, full-featured, statically-linked mouse auto clicker for Windows written in vanilla C++. Uses hardware-limited arrayed Win32 SendInput() calls to reach up to 100000 clicks/s. Supports command line, random clicks and sequences of clicks (since v.2.5.3.2).",
 "image": "https://windows-2048.github.io/The-Fastest-Mouse-Clicker-for-Windows/og_thumb_1200x630.png",
 "operatingSystem":"Windows",
-"softwareVersion":"2.5.3.3",
+"softwareVersion":"2.5.4.0",
 "datePublished":"2020-07-15",
 "interactionStatistic":{
 "@type": "InteractionCounter",
@@ -115,14 +115,14 @@ <h1><img class="mylogo" src="{{site.logo | relative_url}}" alt="Logo" /><a href=
         {% endif %}
 
         {% if site.show_downloads %}
-        <p class="view"><a href="https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.3.3.exe?inline=false">Download the latest version</a></p>
+        <p class="view"><a href="https://gitlab.com/mashanovedad/The-Fastest-Mouse-Clicker-for-Windows/-/raw/master/WindowsInstaller/Install_TheFastestMouseClicker_2.5.4.0.exe?inline=false">Download the latest version 2.5.4.0</a></p>
         {% endif %}
 
 <p class="view">
     <a rel="nofollow" href="https://github.com/login?return_to=%2Fwindows-2048%2FThe-Fastest-Mouse-Clicker-for-Windows" target="_blank">
       <svg height="16" class="octicon octicon-star v-align-text-bottom" vertical_align="text_bottom" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M8 .25a.75.75 0 01.673.418l1.882 3.815 4.21.612a.75.75 0 01.416 1.279l-3.046 2.97.719 4.192a.75.75 0 01-1.088.791L8 12.347l-3.766 1.98a.75.75 0 01-1.088-.79l.72-4.194L.818 6.374a.75.75 0 01.416-1.28l4.21-.611L7.327.668A.75.75 0 018 .25zm0 2.445L6.615 5.5a.75.75 0 01-.564.41l-3.097.45 2.24 2.184a.75.75 0 01.216.664l-.528 3.084 2.769-1.456a.75.75 0 01.698 0l2.77 1.456-.53-3.084a.75.75 0 01.216-.664l2.24-2.183-3.096-.45a.75.75 0 01-.564-.41L8 2.694v.001z"></path></svg>
       Github: 23,
-      243015 downloads
+      255231 downloads
     </a>
 </p>
 <p class="view">
diff --git a/main.cpp b/main.cpp
index 5d9079c..5ae74c8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************
-* The Fastest Mouse Clicker for Windows version 2.5.3.3
+* The Fastest Mouse Clicker for Windows version 2.5.4.0
 * Copyright (c) 2016-2020 by Open Source Developer Masha Novedad
 * Released under GNU Public License GPLv3
 **************************************************************************/
@@ -696,7 +696,7 @@ DWORD WINAPI MyThreadFunction(LPVOID lpParam)
 			status = 0;
 			prevStatus = 2;
 			BlockInput(TRUE);
-			Sleep(100);
+			Sleep(1000);
 			BlockInput(FALSE);
 			mtx.unlock();
 			SetMsgStatus(hWnd, GetDlgCtrlID(statusText), "idle");
@@ -756,7 +756,7 @@ int WINAPI WinMain(HINSTANCE instanceH, HINSTANCE prevInstanceH, LPSTR command_l
 	//Registering the window class
 	RegisterClass(&windClass);
 
-	hWnd=CreateWindow("The Fastest Mouse Clicker for Windows","The Fastest Mouse Clicker for Windows v2.5.3.3", WS_OVERLAPPEDWINDOW, 100, 100,438,480, NULL, NULL, instanceH, NULL);
+	hWnd=CreateWindow("The Fastest Mouse Clicker for Windows","The Fastest Mouse Clicker for Windows v2.5.4.0", WS_OVERLAPPEDWINDOW, 100, 100,438,480, NULL, NULL, instanceH, NULL);
 
 	statusText = CreateWindow("Static","clicking status: idle",WS_VISIBLE|WS_CHILD,5,1,410,35,hWnd,0,0,0);
 	SetMsgStatus(hWnd, GetDlgCtrlID(statusText), "idle");
@@ -981,9 +981,9 @@ int WINAPI WinMain(HINSTANCE instanceH, HINSTANCE prevInstanceH, LPSTR command_l
 				if (toggleState == 3 && !GetAsyncKeyState(atoi(triggerText)))
 				{
 					toggleState = 0;
-					BlockInput(TRUE);
-					Sleep(100);
-					BlockInput(FALSE);
+					//BlockInput(TRUE);
+					//Sleep(100);
+					//BlockInput(FALSE);
 				}
 				mtx.unlock();
 			}
@@ -1006,8 +1006,14 @@ int WINAPI WinMain(HINSTANCE instanceH, HINSTANCE prevInstanceH, LPSTR command_l
 			{
 				UINT nBatchClicks = 1;
 
-				if (frequency >= 1000)
-					nBatchClicks = 1 + UINT(floor((frequency - 1000) / 1000));
+				if (frequency >= 10000)
+					nBatchClicks = 100 + UINT(floor((frequency - 10000) / 100));
+				else if (frequency >= 5000)
+					nBatchClicks = 50 + UINT(floor((frequency - 5000) / 100));
+				else if (frequency >= 1000)
+					nBatchClicks = 10 + UINT(floor((frequency - 1000) / 100));
+				else if (frequency >= 100)
+					nBatchClicks = 1 + UINT(floor((frequency - 100) / 100));
 				else
 					nBatchClicks = 1;
 
@@ -1257,7 +1263,7 @@ LRESULT CALLBACK winCallBack(HWND hWin, UINT msg, WPARAM wp, LPARAM lp)
 			}
 			break;
 		case HELP_BTN:
-			MessageBox(hWnd, "The Fastest Mouse Clicker for Windows v2.5.3.3 (Independent Keys For Toggle Clicking; Window Always Top; Random Clicking)."
+			MessageBox(hWnd, "The Fastest Mouse Clicker for Windows v2.5.4.0 (Independent Keys For Toggle Clicking; Window Always Top; Random Clicking)."
 				"\n\nYOU CAN START THE AUTO-CLICKING AT ANY MOMENT BY PRESSING THE <trigger key> (13 = Enter). Reading the entire Help is optional."
 				"\n\nTHE FIELDS YOU CAN NOT MODIFY."
 				"\n<clicking status> or <random clicking status>, the topmost text field, is either getting 'idle' or 'clicking'."