diff --git a/workers/commandor_page.py b/workers/commandor_page.py
index 2ec019e..d9a8b1e 100644
--- a/workers/commandor_page.py
+++ b/workers/commandor_page.py
@@ -82,13 +82,7 @@ class CommandorPage:
                 self.otp_value = otp
                 self.logger.info("will set thread event")
                 self.thread_event.set()
-                # wait for the sms for 20 seconds
-                # while not self.is_finished:
-                #     time.sleep(2)
                 self.is_finished = True
-                # if self.current_gsm_modem:
-                # self.logger.info("will close used modem")
-                # self.current_gsm_modem.modem.close()
             else:
                 self.logger.info("The sms is not for RDV")
         else:
@@ -141,7 +135,6 @@ class CommandorPage:
             }
         self._setName(self.contact.last_name, self.contact.first_name)
         self._setPhoneCountryAndStore()
-        # self.page.mouse.wheel(0, random.randint(100, 200))
         self._setPhoneNumber(self.contact.phone)
         self._set_email(self.contact.mail)
         self.setIdNumber(self.contact.passport)
@@ -161,9 +154,9 @@ class CommandorPage:
             self.clickOnValidBtn()
             otp_sent = self.page.locator(MESSAGE_FIELD_CLASS)
             otp_sent.wait_for(state='visible', timeout=TIME_OUT)
-        message = self.page.content()
         # print("message is:" + message)
         time.sleep(get_random_wait_time())
+        message = self.page.content()
         if CONFIRMED_MESSAGE in message:
             # publish the successful message
             self.logger.info("url is " + self.page.url)
@@ -199,15 +192,17 @@ class CommandorPage:
 
     def start_page(self, proxy):
         e = threading.Event()
-        # t = threading.Thread(target=self._run, args=(e, proxy))
-        # t.start()
         self._run(e, proxy)
-        # return e
 
     def _on_page_loaded(self):
         self.logger.info("page loaded")
         # self.logger.info("content is " + self.page.content())
         self.logger.info("url is " + self.page.url)
+        message = self.page.content()
+        if CONFIRMED_MESSAGE in message:
+            # publish the successful message
+            self.logger.info("url is " + self.page.url)
+            self.publish_message_to_queue(self.contact, PublishType.SUCCESS, self.page.url)
         self.getErrors()
 
     def on_document_loaded(self):
@@ -363,7 +358,7 @@ def launch_page():
     serial_modem.contact = contact
     serial_modem.phone_number = contact.phone
     page = CommandorPage(serial_modem, slot_position=1, sim_position=1, store_type=1)
-    return page.start_page(None)
+    return page.start_page(proxy)
 
 
 def wait_for_otp(event: threading.Event, commandor: CommandorPage):