diff --git a/arb-bot.js b/arb-bot.js
index 6fc7428b..89f7580f 100755
--- a/arb-bot.js
+++ b/arb-bot.js
@@ -127,8 +127,7 @@ const arbRound = async options => {
         {
             orderHash       : options.orderHash,
             orderOwner      : options.orderOwner,
-            orderInterpreter: options.orderInterpreter,
-            shuffle         : options.shuffle
+            orderInterpreter: options.orderInterpreter
         }
     );
     await clear(
@@ -148,7 +147,6 @@ const main = async argv => {
     const rpcs = [...options.rpc];
     let roundGap = 10000;
     let rpcTurn = 0;
-    let shuffle = 0;
 
     if (options.repetitions) {
         if (/^\d+$/.test(options.repetitions)) repetitions = Number(options.repetitions);
@@ -169,7 +167,6 @@ const main = async argv => {
     // eslint-disable-next-line no-constant-condition
     if (repetitions === -1) while (true) {
         options.rpc = rpcs[rpcTurn];
-        options.shuffle = shuffle;
         try {
             await arbRound(options);
             console.log("\x1b[32m%s\x1b[0m", "Round finished successfully!");
@@ -181,13 +178,10 @@ const main = async argv => {
         }
         if (rpcTurn === rpcs.length - 1) rpcTurn = 0;
         else rpcTurn++;
-        if (shuffle === 3) shuffle = 0;
-        else shuffle++;
         await sleep(roundGap);
     }
     else for (let i = 1; i <= repetitions; i++) {
         options.rpc = rpcs[rpcTurn];
-        options.shuffle = shuffle;
         try {
             await arbRound(options);
             console.log("\x1b[32m%s\x1b[0m", `Round ${i} finished successfully!`);
@@ -201,8 +195,6 @@ const main = async argv => {
         }
         if (rpcTurn === rpcs.length - 1) rpcTurn = 0;
         else rpcTurn++;
-        if (shuffle === 3) shuffle = 0;
-        else shuffle++;
         await sleep(roundGap);
     }
 };
diff --git a/docs/html/curve.js.html b/docs/html/curve.js.html
index 218f30e2..d2a276cc 100644
--- a/docs/html/curve.js.html
+++ b/docs/html/curve.js.html
@@ -290,7 +290,7 @@ <h1 class="page-title">Source: curve.js</h1>
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, undefined, config.rpc !== "test");
         const availableSwaps = getAvailableSwaps(config);
         bundledOrders = prepare(
             bundledOrders,
@@ -673,7 +673,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/global.html b/docs/html/global.html
index 59e52d05..a0560625 100644
--- a/docs/html/global.html
+++ b/docs/html/global.html
@@ -624,7 +624,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1091">line 1091</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1094">line 1094</a>
     </li></ul></dd>
     
 
@@ -1042,7 +1042,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1386">line 1386</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1389">line 1389</a>
     </li></ul></dd>
     
 
@@ -1078,7 +1078,7 @@ <h5>Parameters:</h5>
     
 
     
-    <h4 class="name" id="bundleTakeOrders"><span class="type-signature">(async) </span>bundleTakeOrders<span class="signature">(ordersDetails, orderbook, arb)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="bundleTakeOrders"><span class="type-signature">(async) </span>bundleTakeOrders<span class="signature">(ordersDetails, orderbook, arb, _eval, _shuffle)</span><span class="type-signature"></span></h4>
     
 
     
@@ -1112,6 +1112,8 @@ <h5>Parameters:</h5>
         
 
         
+        <th>Default</th>
+        
 
         <th class="last">Description</th>
     </tr>
@@ -1137,6 +1139,10 @@ <h5>Parameters:</h5>
             
 
             
+                <td class="default">
+                
+                </td>
+            
 
             <td class="description last">Orders details queried from subgraph</td>
         </tr>
@@ -1160,6 +1166,10 @@ <h5>Parameters:</h5>
             
 
             
+                <td class="default">
+                
+                </td>
+            
 
             <td class="description last">The Orderbook EthersJS contract instance with signer</td>
         </tr>
@@ -1183,11 +1193,73 @@ <h5>Parameters:</h5>
             
 
             
+                <td class="default">
+                
+                </td>
+            
 
             <td class="description last">The Arb EthersJS contract instance with signer</td>
         </tr>
 
     
+
+        <tr>
+            
+                <td class="name"><code>_eval</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+
+            
+                <td class="default">
+                
+                    true
+                
+                </td>
+            
+
+            <td class="description last">To eval() the orders and filter them based on the eval result</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>_shuffle</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+
+            
+                <td class="default">
+                
+                    true
+                
+                </td>
+            
+
+            <td class="description last">To shuffle the bundled order array at the end</td>
+        </tr>
+
+    
     </tbody>
 </table>
 
@@ -1225,7 +1297,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line595">line 595</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line597">line 597</a>
     </li></ul></dd>
     
 
@@ -1441,7 +1513,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line202">line 202</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line201">line 201</a>
     </li></ul></dd>
     
 
@@ -2130,7 +2202,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line873">line 873</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line876">line 876</a>
     </li></ul></dd>
     
 
@@ -3098,7 +3170,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line150">line 150</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line149">line 149</a>
     </li></ul></dd>
     
 
@@ -3268,7 +3340,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line782">line 782</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line785">line 785</a>
     </li></ul></dd>
     
 
@@ -3497,7 +3569,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line826">line 826</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line829">line 829</a>
     </li></ul></dd>
     
 
@@ -4020,7 +4092,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1026">line 1026</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1029">line 1029</a>
     </li></ul></dd>
     
 
@@ -4157,7 +4229,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line986">line 986</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line989">line 989</a>
     </li></ul></dd>
     
 
@@ -4350,7 +4422,7 @@ <h5>Returns:</h5>
     
 
     
-    <h4 class="name" id="getQuery"><span class="type-signature"></span>getQuery<span class="signature">(orderHash, owner, interpreter, shuffle)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="getQuery"><span class="type-signature"></span>getQuery<span class="signature">(orderHash, owner, interpreter)</span><span class="type-signature"></span></h4>
     
 
     
@@ -4384,8 +4456,6 @@ <h5>Parameters:</h5>
         
 
         
-        <th>Default</th>
-        
 
         <th class="last">Description</th>
     </tr>
@@ -4411,10 +4481,6 @@ <h5>Parameters:</h5>
             
 
             
-                <td class="default">
-                
-                </td>
-            
 
             <td class="description last">The order hash to apply as filter</td>
         </tr>
@@ -4438,10 +4504,6 @@ <h5>Parameters:</h5>
             
 
             
-                <td class="default">
-                
-                </td>
-            
 
             <td class="description last">The order owner to apply as filter</td>
         </tr>
@@ -4465,46 +4527,11 @@ <h5>Parameters:</h5>
             
 
             
-                <td class="default">
-                
-                </td>
-            
 
             <td class="description last">The interpreter to apply as filter</td>
         </tr>
 
     
-
-        <tr>
-            
-                <td class="name"><code>shuffle</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">number</span>
-
-
-            
-            </td>
-
-            
-
-            
-                <td class="default">
-                
-                    0
-                
-                </td>
-            
-
-            <td class="description last">(optional) A number in range of 0 - 3 that
-will change the order of getting order details from subgraph, mostly
-used for continuous bot running</td>
-        </tr>
-
-    
     </tbody>
 </table>
 
@@ -4542,7 +4569,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="query.js.html">query.js</a>, <a href="query.js.html#line57">line 57</a>
+        <a href="query.js.html">query.js</a>, <a href="query.js.html#line54">line 54</a>
     </li></ul></dd>
     
 
@@ -4873,7 +4900,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1241">line 1241</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1244">line 1244</a>
     </li></ul></dd>
     
 
@@ -5525,7 +5552,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line916">line 916</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line919">line 919</a>
     </li></ul></dd>
     
 
@@ -5721,7 +5748,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1215">line 1215</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1218">line 1218</a>
     </li></ul></dd>
     
 
@@ -6596,7 +6623,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line942">line 942</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line945">line 945</a>
     </li></ul></dd>
     
 
@@ -6779,7 +6806,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1324">line 1324</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1327">line 1327</a>
     </li></ul></dd>
     
 
@@ -7040,7 +7067,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/index.html b/docs/html/index.html
index 8ba6fb79..f14c807b 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/index.js.html b/docs/html/index.js.html
index 18b2a18e..2c5a39b7 100644
--- a/docs/html/index.js.html
+++ b/docs/html/index.js.html
@@ -129,8 +129,7 @@ <h1 class="page-title">Source: index.js</h1>
                         query: getQuery(
                             sgFilters?.orderHash,
                             sgFilters?.orderOwner,
-                            sgFilters?.orderInterpreter,
-                            sgFilters?.shuffle
+                            sgFilters?.orderInterpreter
                         )
                     },
                     { headers: { "Content-Type": "application/json" } }
@@ -306,7 +305,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/query.js.html b/docs/html/query.js.html
index 99624a60..76164697 100644
--- a/docs/html/query.js.html
+++ b/docs/html/query.js.html
@@ -77,36 +77,34 @@ <h1 class="page-title">Source: query.js</h1>
  * @param {string} orderHash - The order hash to apply as filter
  * @param {string} owner - The order owner to apply as filter
  * @param {string} interpreter - The interpreter to apply as filter
- * @param {number} shuffle - (optional) A number in range of 0 - 3 that
- * will change the order of getting order details from subgraph, mostly
- * used for continuous bot running
  * @returns the query string
  */
-const getQuery = (orderHash, owner, interpreter, shuffle = 0) => {
+const getQuery = (orderHash, owner, interpreter) => {
     const orderHashFilter = orderHash ? `, id :"${orderHash.toLowerCase()}"` : "";
     const ownerFilter = owner ? `, owner :"${owner.toLowerCase()}"` : "";
     const interpreterFilter = interpreter ? `, interpreter :"${interpreter.toLowerCase()}"` : "";
-    let orderingProp, orderingDir;
-    const _turn = shuffle % 4;
-    if (_turn === 0) {
-        orderingProp = "id";
-        orderingDir = "asc";
-    }
-    if (_turn === 1) {
-        orderingProp = "id";
-        orderingDir = "desc";
-    }
-    if (_turn === 2) {
-        orderingProp = "timestamp";
-        orderingDir = "asc";
-    }
-    if (_turn === 3) {
-        orderingProp = "timestamp";
-        orderingDir = "desc";
-    }
+    // let orderingProp, orderingDir;
+    // const _turn = shuffle % 4;
+    // if (_turn === 0) {
+    //     orderingProp = "id";
+    //     orderingDir = "asc";
+    // }
+    // if (_turn === 1) {
+    //     orderingProp = "id";
+    //     orderingDir = "desc";
+    // }
+    // if (_turn === 2) {
+    //     orderingProp = "timestamp";
+    //     orderingDir = "asc";
+    // }
+    // if (_turn === 3) {
+    //     orderingProp = "timestamp";
+    //     orderingDir = "desc";
+    // }
+    // orderBy: ${orderingProp}, orderDirection: ${orderingDir},
     return `{
         orders(
-            orderBy: ${orderingProp}, orderDirection: ${orderingDir}, where: {orderActive: true${orderHashFilter}${ownerFilter}${interpreterFilter}}
+            where: {orderActive: true${orderHashFilter}${ownerFilter}${interpreterFilter}}
         ) {
             id
             handleIO 
@@ -167,7 +165,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/router.js.html b/docs/html/router.js.html
index 2b0f08e0..f542ad23 100644
--- a/docs/html/router.js.html
+++ b/docs/html/router.js.html
@@ -89,7 +89,7 @@ <h1 class="page-title">Source: router.js</h1>
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, undefined, config.rpc !== "test");
     }
     else {
         console.log("No orders found, exiting...", "\n");
@@ -506,7 +506,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/srouter.js.html b/docs/html/srouter.js.html
index 34638a9b..47279da0 100644
--- a/docs/html/srouter.js.html
+++ b/docs/html/srouter.js.html
@@ -91,7 +91,7 @@ <h1 class="page-title">Source: srouter.js</h1>
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, maxProfit);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, maxProfit, config.rpc !== "test");
     }
     else {
         console.log("No orders found, exiting...", "\n");
@@ -456,7 +456,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/utils.js.html b/docs/html/utils.js.html
index e7c718a4..b56cc188 100644
--- a/docs/html/utils.js.html
+++ b/docs/html/utils.js.html
@@ -618,9 +618,11 @@ <h1 class="page-title">Source: utils.js</h1>
  * @param {any[]} ordersDetails - Orders details queried from subgraph
  * @param {ethers.Contract} orderbook - The Orderbook EthersJS contract instance with signer
  * @param {ethers.Contract} arb - The Arb EthersJS contract instance with signer
+ * @param {boolean} _eval - To eval() the orders and filter them based on the eval result
+ * @param {boolean} _shuffle - To shuffle the bundled order array at the end
  * @returns Array of bundled take orders
  */
-const bundleTakeOrders = async(ordersDetails, orderbook, arb, _eval = true) => {
+const bundleTakeOrders = async(ordersDetails, orderbook, arb, _eval = true, _shuffle = true) => {
     const bundledOrders = [];
     const obAsSigner = new ethers.VoidSigner(
         orderbook.address,
@@ -798,6 +800,7 @@ <h1 class="page-title">Source: utils.js</h1>
             ? a.ratio.gt(b.ratio) ? 1 : a.ratio.lt(b.ratio) ? -1 : 0
             : 0
     ));
+    if (_shuffle) shuffleArray(bundledOrders);
     return bundledOrders;
 };
 
@@ -1453,6 +1456,30 @@ <h1 class="page-title">Source: utils.js</h1>
     }
 };
 
+const shuffleArray = (array) => {
+    let currentIndex = array.length;
+    let randomIndex = 0;
+
+    // While there remain elements to shuffle.
+    while (currentIndex > 0) {
+
+        // Pick a remaining element.
+        randomIndex = Math.floor(Math.random() * currentIndex);
+        currentIndex--;
+
+        // And swap it with the current element.
+        [
+            array[currentIndex],
+            array[randomIndex]
+        ] = [
+            array[randomIndex],
+            array[currentIndex]
+        ];
+    }
+
+    return array;
+};
+
 module.exports = {
     fallbacks,
     bnFromFloat,
@@ -1477,7 +1504,8 @@ <h1 class="page-title">Source: utils.js</h1>
     getActualClearAmount,
     getRouteForTokens,
     visualizeRoute,
-    build0xQueries
+    build0xQueries,
+    shuffleArray
 };
 </code></pre>
         </article>
@@ -1495,7 +1523,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/zeroex.js.html b/docs/html/zeroex.js.html
index df012dff..45dc8b1d 100644
--- a/docs/html/zeroex.js.html
+++ b/docs/html/zeroex.js.html
@@ -97,7 +97,7 @@ <h1 class="page-title">Source: zeroex.js</h1>
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, undefined, config.rpc !== "test");
         // for (let i = 0; i &lt; bundledOrders.length; i++) {
         //     build0xQueries(
         //         api,
@@ -531,7 +531,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 00:48:16 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sat Sep 16 2023 15:09:46 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/src/curve.js b/src/curve.js
index 95408dbb..3b889c98 100644
--- a/src/curve.js
+++ b/src/curve.js
@@ -262,7 +262,7 @@ const curveClear = async(
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, undefined, config.rpc !== "test");
         const availableSwaps = getAvailableSwaps(config);
         bundledOrders = prepare(
             bundledOrders,
diff --git a/src/index.js b/src/index.js
index a26af1d9..31e6b1de 100644
--- a/src/index.js
+++ b/src/index.js
@@ -101,8 +101,7 @@ const getOrderDetails = async(sgs, json, signer, sgFilters) => {
                         query: getQuery(
                             sgFilters?.orderHash,
                             sgFilters?.orderOwner,
-                            sgFilters?.orderInterpreter,
-                            sgFilters?.shuffle
+                            sgFilters?.orderInterpreter
                         )
                     },
                     { headers: { "Content-Type": "application/json" } }
diff --git a/src/query.js b/src/query.js
index e35d3170..00757900 100644
--- a/src/query.js
+++ b/src/query.js
@@ -49,36 +49,34 @@ const DefaultQuery = `{
  * @param {string} orderHash - The order hash to apply as filter
  * @param {string} owner - The order owner to apply as filter
  * @param {string} interpreter - The interpreter to apply as filter
- * @param {number} shuffle - (optional) A number in range of 0 - 3 that
- * will change the order of getting order details from subgraph, mostly
- * used for continuous bot running
  * @returns the query string
  */
-const getQuery = (orderHash, owner, interpreter, shuffle = 0) => {
+const getQuery = (orderHash, owner, interpreter) => {
     const orderHashFilter = orderHash ? `, id :"${orderHash.toLowerCase()}"` : "";
     const ownerFilter = owner ? `, owner :"${owner.toLowerCase()}"` : "";
     const interpreterFilter = interpreter ? `, interpreter :"${interpreter.toLowerCase()}"` : "";
-    let orderingProp, orderingDir;
-    const _turn = shuffle % 4;
-    if (_turn === 0) {
-        orderingProp = "id";
-        orderingDir = "asc";
-    }
-    if (_turn === 1) {
-        orderingProp = "id";
-        orderingDir = "desc";
-    }
-    if (_turn === 2) {
-        orderingProp = "timestamp";
-        orderingDir = "asc";
-    }
-    if (_turn === 3) {
-        orderingProp = "timestamp";
-        orderingDir = "desc";
-    }
+    // let orderingProp, orderingDir;
+    // const _turn = shuffle % 4;
+    // if (_turn === 0) {
+    //     orderingProp = "id";
+    //     orderingDir = "asc";
+    // }
+    // if (_turn === 1) {
+    //     orderingProp = "id";
+    //     orderingDir = "desc";
+    // }
+    // if (_turn === 2) {
+    //     orderingProp = "timestamp";
+    //     orderingDir = "asc";
+    // }
+    // if (_turn === 3) {
+    //     orderingProp = "timestamp";
+    //     orderingDir = "desc";
+    // }
+    // orderBy: ${orderingProp}, orderDirection: ${orderingDir},
     return `{
         orders(
-            orderBy: ${orderingProp}, orderDirection: ${orderingDir}, where: {orderActive: true${orderHashFilter}${ownerFilter}${interpreterFilter}}
+            where: {orderActive: true${orderHashFilter}${ownerFilter}${interpreterFilter}}
         ) {
             id
             handleIO 
diff --git a/src/router.js b/src/router.js
index 6c9b3dcb..553ba4a3 100644
--- a/src/router.js
+++ b/src/router.js
@@ -61,7 +61,7 @@ const routerClear = async(
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, undefined, config.rpc !== "test");
     }
     else {
         console.log("No orders found, exiting...", "\n");
diff --git a/src/srouter.js b/src/srouter.js
index 6b45dbc8..7f562b35 100644
--- a/src/srouter.js
+++ b/src/srouter.js
@@ -63,7 +63,7 @@ const srouterClear = async(
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, maxProfit);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, maxProfit, config.rpc !== "test");
     }
     else {
         console.log("No orders found, exiting...", "\n");
diff --git a/src/utils.js b/src/utils.js
index 90dca772..657ab53c 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -590,9 +590,11 @@ const estimateProfit = (pairPrice, ethPrice, bundledOrder, gas, gasCoveragePerce
  * @param {any[]} ordersDetails - Orders details queried from subgraph
  * @param {ethers.Contract} orderbook - The Orderbook EthersJS contract instance with signer
  * @param {ethers.Contract} arb - The Arb EthersJS contract instance with signer
+ * @param {boolean} _eval - To eval() the orders and filter them based on the eval result
+ * @param {boolean} _shuffle - To shuffle the bundled order array at the end
  * @returns Array of bundled take orders
  */
-const bundleTakeOrders = async(ordersDetails, orderbook, arb, _eval = true) => {
+const bundleTakeOrders = async(ordersDetails, orderbook, arb, _eval = true, _shuffle = true) => {
     const bundledOrders = [];
     const obAsSigner = new ethers.VoidSigner(
         orderbook.address,
@@ -770,6 +772,7 @@ const bundleTakeOrders = async(ordersDetails, orderbook, arb, _eval = true) => {
             ? a.ratio.gt(b.ratio) ? 1 : a.ratio.lt(b.ratio) ? -1 : 0
             : 0
     ));
+    if (_shuffle) shuffleArray(bundledOrders);
     return bundledOrders;
 };
 
@@ -1425,6 +1428,30 @@ const build0xQueries = (api, queries, tokenAddress, tokenDecimals, tokenSymbol)
     }
 };
 
+const shuffleArray = (array) => {
+    let currentIndex = array.length;
+    let randomIndex = 0;
+
+    // While there remain elements to shuffle.
+    while (currentIndex > 0) {
+
+        // Pick a remaining element.
+        randomIndex = Math.floor(Math.random() * currentIndex);
+        currentIndex--;
+
+        // And swap it with the current element.
+        [
+            array[currentIndex],
+            array[randomIndex]
+        ] = [
+            array[randomIndex],
+            array[currentIndex]
+        ];
+    }
+
+    return array;
+};
+
 module.exports = {
     fallbacks,
     bnFromFloat,
@@ -1449,5 +1476,6 @@ module.exports = {
     getActualClearAmount,
     getRouteForTokens,
     visualizeRoute,
-    build0xQueries
+    build0xQueries,
+    shuffleArray
 };
diff --git a/src/zeroex.js b/src/zeroex.js
index 6938043d..f32d0d9f 100644
--- a/src/zeroex.js
+++ b/src/zeroex.js
@@ -69,7 +69,7 @@ const zeroExClear = async(
         console.log(
             "------------------------- Bundling Orders -------------------------", "\n"
         );
-        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb);
+        bundledOrders = await bundleTakeOrders(ordersDetails, orderbook, arb, undefined, config.rpc !== "test");
         // for (let i = 0; i < bundledOrders.length; i++) {
         //     build0xQueries(
         //         api,