diff --git a/.gitignore b/.gitignore
index 2817702b9ca2437d91f91148fe7c7980b6a9bfe4..ff456d6912b537e7a9fb03f28635b2d78c449818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-config/obsw_user_code.py
-
 _build/*
 _dependencies/*
 _bin/*
diff --git a/.idea/runConfigurations/tmtcclient_Copy_OBSW_Update.xml b/.idea/runConfigurations/tmtcclient_Copy_OBSW_Update.xml
index 5da1e90b560d3818ec94438c15516f7203be48b3..b07441d03a83ada94617bcd82d942312e7f6dac5 100644
--- a/.idea/runConfigurations/tmtcclient_Copy_OBSW_Update.xml
+++ b/.idea/runConfigurations/tmtcclient_Copy_OBSW_Update.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 3 -s Img -o A4U -c 1 -t 4" />
+    <option name="PARAMETERS" value="-m 3 -s Img -o A4U -c 1 -t 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_Report_File_Attributes.xml b/.idea/runConfigurations/tmtcclient_Report_File_Attributes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db863595c539f7dcd16ed7aea1dbaf1f4684622e
--- /dev/null
+++ b/.idea/runConfigurations/tmtcclient_Report_File_Attributes.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcclient Report File Attributes" type="PythonConfigurationType" factoryName="Python" folderName="Serial FileManagement">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m 3 -s SD -o 3 -c 1 -t 2.5" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml b/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
index 20619467d64c2c7257e21a1fa282cde93912dcef..f7ad144c2a5e5866b22fdbddef4cac4d12cac1e7 100644
--- a/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
@@ -12,7 +12,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/core/tmtc_client_core.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
     <option name="PARAMETERS" value="-m 3 -c 3 -s 17 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
diff --git a/core/tmtc_backend.py b/core/tmtc_backend.py
index 392a009f2fe156e6b7d05904005139e828668441..9580eeed34db4de1e1cc0475c87b2bf9b389b457 100644
--- a/core/tmtc_backend.py
+++ b/core/tmtc_backend.py
@@ -171,8 +171,9 @@ class TmTcHandler:
             logging.error("Unknown Mode, Configuration error !")
             sys.exit()
 
-
     def __core_operation(self, one_shot):
+        if self.mode == g.ModeList.ListenerMode:
+            one_shot = False
         if not one_shot:
             while True:
                 self.__handle_action()
diff --git a/utility/obsw_binary_uploader.py b/utility/obsw_binary_uploader.py
index 60c3de66a08d7a357d2ae58b547c3c0d61c3d09b..817d454e1607c67ab4c7f4a20d04a88f4e37e406 100644
--- a/utility/obsw_binary_uploader.py
+++ b/utility/obsw_binary_uploader.py
@@ -37,7 +37,8 @@ class BinaryFileUploader:
         self.tmtc_printer = tmtc_printer
         self.tm_listener = tm_listener
         self.iobc = False
-        self.send_interval = 1.0
+        # Will be set later depending on board.
+        self.send_interval = 0
 
     def perform_file_upload(self):
         gui_cl_prompt = input("GUI(0) or command line version (1)? [0/1]: ")
@@ -89,7 +90,7 @@ class BinaryFileUploader:
         iobc_prompt = input("iOBC? [y/n]: ")
         if iobc_prompt in ['y', 'yes', 1]:
             self.iobc = True
-            self.send_interval = 0.8
+            self.send_interval = 1.4
             iobc_prompt = True
         else:
             self.iobc = False