diff --git a/Projects/Superalgos/Schemas/AppSchema.json b/Projects/Superalgos/Schemas/AppSchema.json
index 6eb0013a3..abc4f3569 100644
--- a/Projects/Superalgos/Schemas/AppSchema.json
+++ b/Projects/Superalgos/Schemas/AppSchema.json
@@ -15789,7 +15789,7 @@
             }
         ],
         "initialValues": {
-"config": "{ \n\"codeName\": \"DOUBLE_CLICK_ON_THIS_STRING_TO_SELECT_IT_XXX_DELETE_IT_AND_PASTE_YOUR_EXCHANGE_API_PUBLIC_KEY\",\n\"secret\": \"REPLACE_THIS_STRING_WITH_YOUR_API_KEY_SECRET\"\n,\n\"uid\": \"REPLACE_THIS_STRING_WITH_YOUR_UID_IF_NECESSARY\"\n}"        },
+"config": "{ \n\"codeName\": \"DOUBLE_CLICK_ON_THIS_STRING_TO_SELECT_IT_XXX_DELETE_IT_AND_PASTE_YOUR_EXCHANGE_API_PUBLIC_KEY\",\n\"secret\": \"REPLACE_THIS_STRING_WITH_YOUR_API_KEY_SECRET\"\n,\n\"uid\": \"REPLACE_THIS_STRING_WITH_YOUR_UID_IF_NECESSARY\"\n,\n\"password\": \"REPLACE_THIS_STRING_WITH_YOUR_PASSWORD_IF_NECESSARY\"\n}"        },
         "addLeftIcons": true,
         "editors": {
             "config": true
diff --git a/Projects/Superalgos/Schemas/Docs-Nodes/exchange-account-key.json b/Projects/Superalgos/Schemas/Docs-Nodes/exchange-account-key.json
index 79e064c61..aea174f36 100644
--- a/Projects/Superalgos/Schemas/Docs-Nodes/exchange-account-key.json
+++ b/Projects/Superalgos/Schemas/Docs-Nodes/exchange-account-key.json
@@ -16,9 +16,21 @@
             "style": "List",
             "text": "codeName is the name or label of your key, as supplied by the exchange."
         },
+        {
+            "style": "List",
+            "text": "secret is the secret key supplied by the exchange."
+        },
+        {
+            "style": "List",
+            "text": "uid is the uid supplied by the exchange. This is not required for all exchanges."
+        },
+        {
+            "style": "List",
+            "text": "password is the password or passphrase supplied at the creation of the key and secret. This is not required for all exchanges."
+        },
         {
             "style": "Warning",
             "text": "To keep your exchange keys safe, never share data structures you may download from the system, as downloads contain all information in the data structure, including personal information such as exchange keys. Use the share option on the menu instead. The share option strips sensitive information and outputs a file that is safe for sharing."
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Projects/Superalgos/Schemas/Docs-Topics/tested-exchanges-010-coinbasepro-test-status.json b/Projects/Superalgos/Schemas/Docs-Topics/tested-exchanges-010-coinbasepro-test-status.json
index b85b8b9f9..114859374 100644
--- a/Projects/Superalgos/Schemas/Docs-Topics/tested-exchanges-010-coinbasepro-test-status.json
+++ b/Projects/Superalgos/Schemas/Docs-Topics/tested-exchanges-010-coinbasepro-test-status.json
@@ -14,18 +14,18 @@
         },
         {
             "style": "List",
-            "text": "1-min OHLCVs Capability: Yes. The ability to fetch historic data for backtesting purposes has not been fully verified.",
-            "updated": 1616005829277
+            "text": "1-min OHLCVs Capability: Yes. Backtesting and Paper trading are functional. The data mining process is extremely slow when retrieving full history due to API limits but it is adequate for live trading purposes.",
+            "updated": 1617935711274
         },
         {
             "style": "List",
-            "text": "Market History: Unknown",
-            "updated": 1615453086807
+            "text": "Market History: Full extent is unknown, however it is at least 2020-01-01.",
+            "updated": 1617935743856
         },
         {
             "style": "List",
-            "text": "Trading Capability: Unknown.The ability to run strategies in live-trading mode has not been verified.",
-            "updated": 1616005834904
+            "text": "Trading Capability: Partial. With a proper key configuration placing orders is possible. Currently, closing orders is not fully functional, so all types of trading strategies may not be fully functional.",
+            "updated": 1617935811860
         },
         {
             "style": "List",
@@ -34,16 +34,24 @@
         },
         {
             "style": "Title",
-            "text": "Configuration"
+            "text": "Exchange Configuration"
         },
         {
             "style": "Json",
             "text": "{\n    \"codeName\": \"coinbasepro\",\n    \"API\": [\n        {\n            \"method\": \"fetch_ohlcv\",\n            \"limit\": 300\n        }\n    ]\n}",
-            "updated": 1615453067170
+            "updated": 1617935879109
+        },
+        {
+            "style": "Title",
+            "text": "API Key Configuration"
+        },
+        {
+            "style": "Json",
+            "text": "{\n    \"codeName\": \"APIKEY\",\n    \"secret\": \"SECRETKEY\",\n    \"password\": \"PASSPHRASE\"\n}"
         },
         {
             "style": "Text",
             "text": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js
index 380a27253..c3b50a007 100644
--- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js
@@ -643,7 +643,7 @@ exports.newSuperalgosBotModulesTradingOrders = function (processIndex) {
 
         let message
         let docs
-        
+
         if (order === undefined) {
 
             message = 'Order Status Not Sync With Exchange'
@@ -714,7 +714,7 @@ exports.newSuperalgosBotModulesTradingOrders = function (processIndex) {
             TS.projects.superalgos.utilities.docsFunctions.buildPlaceholder(docs, undefined, undefined, undefined, undefined, undefined, contextInfo)
 
             tradingSystem.addInfo([tradingSystemOrder.id, message, docs])
-            return
+            return true
         }
 
         const AT_EXCHANGE_STATUS = {