diff --git a/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt b/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
index 92522f7..ac790a3 100644
--- a/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
+++ b/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
@@ -14,6 +14,7 @@ class MatterLinkConfig(file: File) : BaseConfig() {
                 getBoolean = config::getBoolean,
                 getString = config::getString,
                 getStringValidated = config::getString,
+                getStringValidValues = config::getString,
                 getStringList = config::getStringList,
                 addCustomCategoryComment = config::addCustomCategoryComment
         )
diff --git a/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt b/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
index 92522f7..ac790a3 100644
--- a/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
+++ b/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
@@ -14,6 +14,7 @@ class MatterLinkConfig(file: File) : BaseConfig() {
                 getBoolean = config::getBoolean,
                 getString = config::getString,
                 getStringValidated = config::getString,
+                getStringValidValues = config::getString,
                 getStringList = config::getStringList,
                 addCustomCategoryComment = config::addCustomCategoryComment
         )
diff --git a/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt b/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
index d91c708..bbd1ff5 100644
--- a/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
+++ b/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
@@ -14,10 +14,10 @@ class MatterLinkConfig(file: File) : BaseConfig() {
                 getBoolean = config::getBoolean,
                 getString = config::getString,
                 getStringValidated = config::getString,
+                getStringValidValues = config::getString,
                 getStringList = config::getStringList,
                 addCustomCategoryComment = config::addCustomCategoryComment
         )
-
         if (config.hasChanged()) config.save()
         cfg = this
     }
diff --git a/core/src/main/kotlin/matterlink/IMatterLink.kt b/core/src/main/kotlin/matterlink/IMatterLink.kt
index d35755f..1908966 100644
--- a/core/src/main/kotlin/matterlink/IMatterLink.kt
+++ b/core/src/main/kotlin/matterlink/IMatterLink.kt
@@ -1,6 +1,7 @@
 package matterlink
 
 import matterlink.bridge.MessageHandler
+import matterlink.config.cfg
 
 lateinit var instance: IMatterLink
 
@@ -25,7 +26,14 @@ abstract class IMatterLink {
     fun error(formatString: String, vararg data: Any) = log("ERROR", formatString, *data)
     fun warn(formatString: String, vararg data: Any) = log("WARN", formatString, *data)
     fun info(formatString: String, vararg data: Any) = log("INFO", formatString, *data)
-    fun debug(formatString: String, vararg data: Any) = log("DEBUG", formatString, *data)
-    fun trace(formatString: String, vararg data: Any) = log("TRACE", formatString, *data)
+    fun debug(formatString: String, vararg data: Any) {
+        if (cfg!!.relay.logLevel == "DEBUG" || cfg!!.relay.logLevel == "TRACE")
+            log("INFO", "DEBUG: " + formatString.replace("\n", "\nDEBUG: "), *data)
+    }
+
+    fun trace(formatString: String, vararg data: Any) {
+        if (cfg!!.relay.logLevel == "TRACE")
+            log("INFO", "TRACE: " + formatString.replace("\n", "\nTRACE: "), *data)
+    }
 
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/matterlink/bridge/HttpStreamConnection.kt b/core/src/main/kotlin/matterlink/bridge/HttpStreamConnection.kt
index 081241e..e3b19f4 100644
--- a/core/src/main/kotlin/matterlink/bridge/HttpStreamConnection.kt
+++ b/core/src/main/kotlin/matterlink/bridge/HttpStreamConnection.kt
@@ -52,7 +52,7 @@ class HttpStreamConnection(getClosure: () -> HttpGet,
                 if (chars > 0) {
                     buffer += String(buf.dropLast(buf.count() - chars).toByteArray())
 
-                    instance.debug(buffer)
+                    instance.trace(buffer)
 
                     while (buffer.contains("\n")) {
                         val line = buffer.substringBefore("\n")
diff --git a/core/src/main/kotlin/matterlink/bridge/MessageHandler.kt b/core/src/main/kotlin/matterlink/bridge/MessageHandler.kt
index 5bda4e4..0720094 100644
--- a/core/src/main/kotlin/matterlink/bridge/MessageHandler.kt
+++ b/core/src/main/kotlin/matterlink/bridge/MessageHandler.kt
@@ -50,7 +50,7 @@ object MessageHandler {
                     rcvQueue.add(
                             ApiMessage.decode(it)
                     )
-                    instance.debug("Received: " + it)
+//                    instance.debug("Received: " + it)
                 },
                 {
                     instance.warn("Bridge connection closed!")
diff --git a/core/src/main/kotlin/matterlink/config/BaseConfig.kt b/core/src/main/kotlin/matterlink/config/BaseConfig.kt
index a0ea39b..0079f31 100644
--- a/core/src/main/kotlin/matterlink/config/BaseConfig.kt
+++ b/core/src/main/kotlin/matterlink/config/BaseConfig.kt
@@ -24,7 +24,8 @@ abstract class BaseConfig {
 
     data class RelayOptions(
             var systemUser: String = "Server",
-            var advancements: Boolean = true
+            var advancements: Boolean = true,
+            var logLevel: String = "INFO"
     )
 
     data class FormattingOptions(
@@ -94,6 +95,7 @@ abstract class BaseConfig {
             getBoolean: (key: String, category: String, default: Boolean, comment: String) -> Boolean,
             getString: (key: String, category: String, default: String, comment: String) -> String,
             getStringValidated: (key: String, category: String, default: String, comment: String, pattern: Pattern) -> String,
+            getStringValidValues: (key: String, category: String, default: String, comment: String, validValues: Array<String>) -> String,
             addCustomCategoryComment: (key: String, comment: String) -> Unit,
             getStringList: (name: String, category: String, defaultValues: Array<String>, comment: String) -> Array<String>
     ) {
@@ -111,6 +113,13 @@ abstract class BaseConfig {
                         category,
                         relay.advancements,
                         "Relay player advancements"
+                ),
+                logLevel = getStringValidValues(
+                        "logLevel",
+                        category,
+                        relay.logLevel,
+                        "MatterLink log level",
+                        arrayOf("INFO", "DEBUG", "TRACE")
                 )
         )