diff --git a/commands/estimate.js b/commands/estimate.js
index c3f1283..c9757ca 100644
--- a/commands/estimate.js
+++ b/commands/estimate.js
@@ -1,6 +1,6 @@
 const priceTable = [
     {
-        regex: /\b(?:thp|summoner|summ)\b/i,
+        regex: /\b(?:thp|summoner|summ|thp armor|summoner armor|summ armor)\b/i,
         returnKeyWord: "summoner piece",
         prices: [
             "1000;10",
@@ -13,7 +13,7 @@ const priceTable = [
         ],
     },
     {
-        regex: /\b(?:dps|ab2)\b/i,
+        regex: /\b(?:dps|ab2|dps armor|ab2 armor)\b/i,
         returnKeyWord: "dps/ab2 piece",
         prices: [
             "1400;20",
@@ -24,7 +24,7 @@ const priceTable = [
             "1650;500",
             "1700;1000",
             "1750;2000",
-            "1800;50000",
+            "1800;5000",
         ],
     },
     {
@@ -33,7 +33,7 @@ const priceTable = [
         prices: ["980;5", "1050;15", "1100;40", "1150;70", "1200;500"],
     },
     {
-        regex: /\b(?:app builder|apprentice builder|app piece|apprentice piece)\b/i,
+        regex: /\b(?:app builder armor|apprentice builder piece|apprentice builder armor|app piece|apprentice piece)\b/i,
         returnKeyWord: "apprentice builder piece",
         prices: [
             "2000;25",
@@ -44,11 +44,11 @@ const priceTable = [
             "2250;220",
             "2300;500",
             "2350;1000",
-            "2400;50000",
+            "2400;2000",
         ],
     },
     {
-        regex: /\b(?:app builder staff|apprentice build staff|app staff|apprentice staff)\b/i,
+        regex: /\b(?:app builder staff|apprentice builder staff|app staff|apprentice staff)\b/i,
         returnKeyWord: "apprentice builder staff",
         prices: [
             "2200;5",