diff --git a/changelog.txt b/changelog.txt
index 0b59280..efadd58 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,9 +1,14 @@
+Version: 3.2.3
+  Bugfixes:
+    - Fixed occasionally compression number wouldn't appear on unit group
+    - Fixed squad compression could take place when attacking
+    - Fixed squad command timeout duration to account for 4 chunk pathing finding
+
 ---------------------------------------------------------------------------------------------------
 Version: 3.2.2
   Bugfixes:
     - Fixed invalid unit group in gathering when the AI hasn't awakened
     - Fixed invalid reference to chunkToTurrets on removing map chunk
-    - Fixed occasionally compression number wouldn't appear on unit group
 
 ---------------------------------------------------------------------------------------------------
 Version: 3.2.1
diff --git a/info.json b/info.json
index c2990de..fb1c9e9 100644
--- a/info.json
+++ b/info.json
@@ -1,7 +1,7 @@
 {
     "name" : "Rampant",
     "factorio_version" : "1.1",
-    "version" : "3.2.2",
+    "version" : "3.2.3",
     "title" : "Rampant",
     "author" : "Veden",
     "homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445",
diff --git a/libs/Constants.lua b/libs/Constants.lua
index 487396c..dca1b26 100644
--- a/libs/Constants.lua
+++ b/libs/Constants.lua
@@ -223,7 +223,8 @@ constants.GROUP_MERGE_DISTANCE = 28
 
 constants.MAX_PENALTY_BEFORE_PURGE = 36000
 
-constants.COMMAND_TIMEOUT = 30 * 60
+constants.COMMAND_TIMEOUT = 1 * constants.TICKS_A_MINUTE
+constants.BUILD_COMMAND_TIMEOUT = 7 * constants.TICKS_A_MINUTE
 
 -- player building pheromones