diff --git a/plugin/YPTSocket/YPTSocket.php b/plugin/YPTSocket/YPTSocket.php
index aaad370b0..6404fcc11 100644
--- a/plugin/YPTSocket/YPTSocket.php
+++ b/plugin/YPTSocket/YPTSocket.php
@@ -1,180 +1,180 @@
 <?php
 /**
  * to stop
  * find who is using the port 
  * * lsof -i :25
  * Kill it
  * * kill -9 PID
  */
 global $global;
 require_once $global['systemRootPath'] . 'plugin/Plugin.abstract.php';
 
 require_once $global['systemRootPath'] . 'plugin/YPTSocket/functions.php';
 
 class YPTSocket extends PluginAbstract {
 
     public function getDescription() {
         global $global;
         $desc = '<span class="socket_info" style="float: right; margin:0 10px;">'.getSocketConnectionLabel().'</span><script>if(isSocketActive()){setSocketIconStatus(\'connected\');}</script> ';
         $desc .= "Socket Plugin, WebSockets allow for a higher amount of efficiency compared to REST because they do not require the HTTP request/response overhead for each message sent and received<br>";
-        $desc .= "<br>To start it on server now <code>sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/serverRestart.php &</code>";
+        $desc .= "<br>To start it on server now <code>sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &</code>";
         $desc .= "<br>To test use <code>php {$global['systemRootPath']}plugin/YPTSocket/test.php</code>";
-        $desc .= "<br>To start it on server reboot add it on your crontab (Ubuntu 18+) <code>sudo crontab -eu root</code> than add this code on the last line <code>@reboot sleep 60;nohup php {$global['systemRootPath']}plugin/YPTSocket/serverRestart.php &</code>";
+        $desc .= "<br>To start it on server reboot add it on your crontab (Ubuntu 18+) <code>sudo crontab -eu root</code> than add this code on the last line <code>@reboot sleep 60;nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &</code>";
         $desc .= "<br>If you use Certbot to renew your SSL use (Ubuntu 18+) <code>sudo crontab -eu root</code> than add this code on the last line <code>0 1 * * * nohup php {$global['systemRootPath']}plugin/YPTSocket/serverCertbot.php &</code>";
         $help = "<br>run this command start the server <small><a href='https://github.com/WWBN/AVideo/wiki/Socket-Plugin' target='__blank'><i class='fas fa-question-circle'></i> Help</a></small>";
 
         //$desc .= $this->isReadyLabel(array('YPTWallet'));
         return $desc.$help;
     }
 
     public function getName() {
         return "YPTSocket";
     }
 
     public function getUUID() {
         return "YPTSocket-5ee8405eaaa16";
     }
 
     public function getPluginVersion() {
         return "1.1";
     }
     
     public static function getServerVersion() {
         return "2.6";
     }
 
     public function updateScript() {
         global $global;
         /*
           if (AVideoPlugin::compareVersion($this->getName(), "2.0") < 0) {
           sqlDal::executeFile($global['systemRootPath'] . 'plugin/PayPerView/install/updateV2.0.sql');
           }
          * 
          */
         return true;
     }
 
     public function getEmptyDataObject() {
         global $global;
         $obj = new stdClass();
         
         $host = parse_url($global['webSiteRootURL'], PHP_URL_HOST);
         $server_crt_file = "/etc/letsencrypt/live/{$host}/fullchain.pem";
         $server_key_file = "/etc/letsencrypt/live/{$host}/privkey.pem";
         
         $host = parse_url($global['webSiteRootURL'], PHP_URL_HOST);
         
         $obj->forceNonSecure = false;
         self::addDataObjectHelper('forceNonSecure', 'Force not to use wss (non secure)', 'This is good if a reverse proxy is giving you a SSL');
         $obj->port = "2053";
         self::addDataObjectHelper('port', 'Server Port', 'You also MUST open this port on the firewall');
         $obj->host = $host;
         self::addDataObjectHelper('host', 'Server host', 'If your site is HTTPS make sure this host also handle the SSL connection');
         $obj->debugSocket = true;
         self::addDataObjectHelper('debugSocket', 'Show server debugger to admin', 'This will show a panel with some socket informations to the ADMIN user only');
         $obj->debugAllUsersSocket = false;
         self::addDataObjectHelper('debugAllUsersSocket', 'Show server debugger to all', 'Same as above but will show the panel to all users');
         $obj->server_crt_file = $server_crt_file;
         self::addDataObjectHelper('server_crt_file', 'SSL Certificate File', 'If your site use HTTPS, you MUST provide one');
         $obj->server_key_file = $server_key_file;
         self::addDataObjectHelper('server_key_file', 'SSL Certificate Key File', 'If your site use HTTPS, you MUST provide one');
         $obj->allow_self_signed = true;
         self::addDataObjectHelper('allow_self_signed', 'Allow self signed certs', 'Should be unchecked in production');
         
         $obj->showTotalOnlineUsersPerVideo = true;
         self::addDataObjectHelper('showTotalOnlineUsersPerVideo', 'Show Total Online Users Per Video');
         $obj->showTotalOnlineUsersPerLive = true;
         self::addDataObjectHelper('showTotalOnlineUsersPerLive', 'Show Total Online Users Per Live');
         $obj->showTotalOnlineUsersPerLiveLink = true;
         self::addDataObjectHelper('showTotalOnlineUsersPerLiveLink', 'Show Total Online Users Per LiveLink');        
         
         return $obj;
     }
     
     public function getFooterCode() {
         self::getSocketJS();
     }
 
     public static function getSocketJS() {
         global $global;
         include $global['systemRootPath'] . 'plugin/YPTSocket/footer.php';
     }
     
     public static function sendAsync($msg, $callbackJSFunction = "", $users_id = "", $send_to_uri_pattern = "") {
         global $global;
         if(!is_string($msg)){
             $msg = json_encode($msg);
         }
         $command = "php {$global['systemRootPath']}plugin/YPTSocket/send.json.php '$msg' '$callbackJSFunction' '$users_id' '$send_to_uri_pattern'";
         execAsync($command);
     }
 
     public static function send($msg, $callbackJSFunction = "", $users_id = "", $send_to_uri_pattern = "") {
         global $global, $SocketSendObj, $SocketSendUsers_id, $SocketSendResponseObj, $SocketURL;
         if(!is_string($msg)){
             $msg = json_encode($msg);
         }
         $SocketSendUsers_id = $users_id;
         if(!is_array($SocketSendUsers_id)){
             $SocketSendUsers_id = array($SocketSendUsers_id);
         }
         
         $SocketSendObj = new stdClass();
         $SocketSendObj->msg = $msg;
         $SocketSendObj->json = _json_decode($msg);
         
         $SocketSendObj->webSocketToken = getEncryptedInfo(0,$send_to_uri_pattern);
         $SocketSendObj->callback = $callbackJSFunction;
         
         $SocketSendResponseObj = new stdClass();
         $SocketSendResponseObj->error = true;
         $SocketSendResponseObj->msg = "";
         $SocketSendResponseObj->msgObj = $SocketSendObj;
         $SocketSendResponseObj->callbackJSFunction = $callbackJSFunction;  
         
         require_once $global['systemRootPath'] . 'objects/autoload.php';
 
         $SocketURL = self::getWebSocketURL(true, $SocketSendObj->webSocketToken);
         _error_log("Socket Send: {$SocketURL}");
         \Ratchet\Client\connect($SocketURL)->then(function($conn) {
             global $SocketSendObj, $SocketSendUsers_id, $SocketSendResponseObj;
             $conn->on('message', function($msg) use ($conn, $SocketSendResponseObj) {
                 //echo "Received: {$msg}\n";
                 //$conn->close();
                 $SocketSendResponseObj->error = false;
                 $SocketSendResponseObj->msg = $msg;
             });
 
             foreach ($SocketSendUsers_id as $users_id) {
                 $SocketSendObj->to_users_id = $users_id;
                 $conn->send(json_encode($SocketSendObj));
             }
         
             $conn->close();
             
             //$SocketSendResponseObj->error = false;
         }, function ($e) {
             global $SocketURL;
             _error_log("Could not connect: {$e->getMessage()} {$SocketURL}", AVideoLog::$ERROR);
         });
         
         return $SocketSendResponseObj;
     }
 
     public static function getWebSocketURL($isCommandLine=false, $webSocketToken='') {
         global $global;
         $socketobj = AVideoPlugin::getDataObject("YPTSocket");
         $address = $socketobj->host;
         $port = $socketobj->port;
         $protocol = "ws";
         $scheme = parse_url($global['webSiteRootURL'], PHP_URL_SCHEME);
         if(strtolower($scheme)==='https'){
             $protocol = "wss";
         }
         if(empty($webSocketToken)){
             $webSocketToken = getEncryptedInfo(0);
         }
         return "{$protocol}://{$address}:{$port}?webSocketToken={$webSocketToken}&isCommandLine=".intval($isCommandLine);
     }
 
 }
diff --git a/plugin/YPTSocket/footer.php b/plugin/YPTSocket/footer.php
index 749304c98..d17e8849e 100644
--- a/plugin/YPTSocket/footer.php
+++ b/plugin/YPTSocket/footer.php
@@ -1,259 +1,259 @@
 <?php
 if (isBot()) {
     return false;
 }
 $refl = new ReflectionClass('SocketMessageType');
 $obj = AVideoPlugin::getDataObjectIfEnabled('YPTSocket');
 if (!empty($obj->debugAllUsersSocket) || (User::isAdmin() && !empty($obj->debugSocket))) {
     $socket_info_container_class = '';
     $socket_info_container_top = 60;
     $socket_info_container_left = 50;
     if (isset($_COOKIE['socketInfoMinimized'])) {
         $socket_info_container_class = 'socketMinimized';
     }
     if (isset($_COOKIE['socketInfoPositionTop'])) {
         $socket_info_container_top = $_COOKIE['socketInfoPositionTop'];
     }
     if (isset($_COOKIE['socketInfoPositionLeft'])) {
         $socket_info_container_left = $_COOKIE['socketInfoPositionLeft'];
     }
-    $command = "sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/serverRestart.php &";
+    $command = "sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &";
     ?>
     <style>
         #socket_info_container>div{
             text-shadow: 0 0 2px #FFF;
             padding: 5px;
             font-size: 11px;
         }
         #socket_info_container div.socketItem span{
             float: right;
             color: #fff;
             text-align: center;
             white-space: nowrap;
             vertical-align: middle;
             background-color: #777;
             border-radius: 10px;
             font-size: 11px;
             margin-left: 10px;
             text-shadow: none;
             padding: 2px 3px;
         }
         #socket_info_container{
             border-radius: 5px;
             border: 2px solid transparent;
             position: fixed; 
             top: <?php echo $socket_info_container_top; ?>px; 
             left: <?php echo $socket_info_container_left; ?>px; 
 
             background-color: rgba(255,255,255,0);
             color: #000;
 
             -webkit-transition: background-color  0.5s linear;
             -moz-transition: background-color  0.5s linear;
             -ms-transition: background-color  0.5s linear;
             -o-transition: background-color  0.5s linear;
             transition: background-color  0.5s linear;
             transition: box-shadow 0.5s ease-in-out;
             z-index: 1000;
             -moz-box-shadow:    0 0 0 #00000000;
             -webkit-box-shadow: 0 0 0 #00000000;
             box-shadow:         0 0 0 #00000000;
 
         }
         #socket_info_container:hover{
             background-color: rgba(255,255,255,1);
             -moz-box-shadow:    0 0 10px #000000;
             -webkit-box-shadow: 0 0 10px #000000;
             box-shadow:         0 0 10px #000000;
             border: 2px solid #777;
         }
 
         #socket_info_container div{
             color: #00000077;
         }
         #socket_info_container .socketItem span{
             opacity: 0.5;
         }
 
         #socket_info_container.socketMinimized .socketItem{
             display: none;
         }
 
         #socket_info_container .socketItem {
             background-color: rgba(255,255,255,0.8);
         }
         .socketTitle, .socketTitle span{
             text-align: center;
             font-size: 14px;
             width: 100%;
             cursor: move;
         }
         #socket_info_container > div.socketHeader{
             padding: 2px 15px 2px 5px;
         }
         .socketHeader, .socketUserName{
             cursor: pointer;
         }
         #socket_info_container > div.clearfix{
             cursor: move;
         }
         #socketUsersURI{
             max-height: 300px;
             overflow: auto;
         }
         #socketUsersURI a{
             text-overflow: ellipsis;
             overflow: hidden; 
             max-width: 300px;
         }
         .socketItem img{
             height: 20px;
             width: 20px;
             margin: 2px 5px 2px 0;
             display: inline;
         }
         #socket_info_container > div:last-child{
             margin-top: 5px;
             border-top: solid 1px #000;
         }
         .hideNotConected, .hideNotDisconnected,
         .socketUserDiv .socketUserPages,
         .socketUserDiv .fa-caret-up,
         .socketUserDiv.visible .fa-caret-down{
             display: none;
         }
         .socket_connected .hideNotConected,
         .socketUserDiv.visible .socketUserPages,
         .socket_disconnected .hideNotDisconnected{
             display: block;
         }
         
         .socketUserDiv.visible .fa-caret-up{
             display: inline-block;
         }
     </style>
     <div id="socket_info_container" class="socket_info <?php echo $socket_info_container_class; ?>" >
         <div class="socketHeader">
             <?php
             echo getSocketConnectionLabel();
             ?>
         </div>
         <div class="socketItem hideNotDisconnected" ><button class="btn btn-xs btn-block btn-default" onclick="copyToClipboard('<?php echo addcslashes($command,'\\'); ?>')">Copy code to run on terminal</button></div>
         <div class="socketItem hideNotConected" ><i class="fas fa-user"></i> Your User ID <span class="socket_users_id">0</span></div>
         <div class="socketItem hideNotConected" ><i class="fas fa-id-card"></i> Socket ResourceId <span class="socket_resourceId">0</span></div>
         <div class="socketItem hideNotConected" ><i class="fas fa-network-wired"></i> Total Different Devices <span class="total_devices_online">0</span></div>
         <div class="socketItem hideNotConected" ><i class="fas fa-users"></i> Total Users Online <span class="total_users_online">0</span></div>
         <div class="socketItem hideNotConected" id="socketUsersURI">    
         </div>
     </div>
     <script>
         var socket_info_container_draging = false;
         $(document).ready(function () {
             if (typeof $("#socket_info_container").draggable === 'function') {
                 $("#socket_info_container").draggable({
                     start: function (event, ui) {
                         socket_info_container_draging = true;
                     },
                     stop: function (event, ui) {
                         setTimeout(function(){socket_info_container_draging = false;},100);
                         var currentPos = $(this).position();
                         Cookies.set('socketInfoPositionTop', currentPos.top, {
                             path: '/',
                             expires: 365
                         });
                         Cookies.set('socketInfoPositionLeft', currentPos.left, {
                             path: '/',
                             expires: 365
                         });
                     }
                 });
             } else {
                 $("#socket_info_container").hide();
             }
             $(".socketHeader").click(function () {
                 socketInfoToogle()
             });
             checkSocketInfoPosition();
         });
 
         function socketInfoMinimize() {
             $("#socket_info_container").addClass('socketMinimized');
 
             Cookies.set('socketInfoMinimized', 1, {
                 path: '/',
                 expires: 365
             });
         }
         function socketInfoMaximize() {
             $("#socket_info_container").removeClass('socketMinimized');
             Cookies.set('socketInfoMinimized', 0, {
                 path: '/',
                 expires: 365
             });
         }
         function socketInfoToogle() {
             if(socket_info_container_draging){
                 return false;
             }
             if ($("#socket_info_container").hasClass('socketMinimized')) {
                 socketInfoMaximize();
             } else {
                 socketInfoMinimize();
             }
         }
 
         function checkSocketInfoPosition() {
             var currentPos = $('#socket_info_container').position();
             var maxLeft = $(window).width() - $('#socket_info_container').width();
             var maxTop = $(window).height() - $('#socket_info_container').height();
 
             if (currentPos.top < 60 || currentPos.left < 60 || currentPos.top > maxTop || currentPos.left > maxLeft) {
                 $('#socket_info_container').css('top', '60px');
                 $('#socket_info_container').css('left', '60px');
             }
         }
 
         function socketUserNameToggle(socketUserDivID) {
             var isVisible = $(socketUserDivID).find('.socketUserPages').is(":visible");
             if (isVisible) {
                 $(socketUserDivID).removeClass('visible');
             } else {
                 $(socketUserDivID).addClass('visible');
             }
             Cookies.set(socketUserDivID, !isVisible, {
                 path: '/',
                 expires: 365
             });
         }
 
     </script>
     <?php
 }
 ?>
 <script>
     var webSocketSelfURI = '<?php echo getSelfURI(); ?>';
     var webSocketVideos_id = '<?php echo getVideos_id(); ?>';
     var webSocketLiveKey = '<?php echo json_encode(isLive()); ?>';
     var webSocketServerVersion = '<?php echo YPTSocket::getServerVersion(); ?>';
     var webSocketToken = '';
     var webSocketURL = '';
     var webSocketTypes = <?php echo json_encode($refl->getConstants()); ?>;
 
 
     function onUserSocketConnect(response) {
         try {
 <?php echo AVideoPlugin::onUserSocketConnect(); ?>
         } catch (e) {
             console.log('onUserSocketConnect:error', e.message);
         }
     }
 
     function onUserSocketDisconnect(response) {
         try {
 <?php echo AVideoPlugin::onUserSocketDisconnect(); ?>
         } catch (e) {
             console.log('onUserSocketConnect:error', e.message);
         }
     }
 </script>
 <script src="<?php echo getCDN(); ?>plugin/YPTSocket/script.js?<?php echo filectime($global['systemRootPath'] . 'plugin/YPTSocket/script.js'); ?>" type="text/javascript"></script>
diff --git a/plugin/YPTSocket/serverCertbot.php b/plugin/YPTSocket/serverCertbot.php
index a6c72fb99..39c4e81b3 100644
--- a/plugin/YPTSocket/serverCertbot.php
+++ b/plugin/YPTSocket/serverCertbot.php
@@ -1,26 +1,26 @@
 <?php
 use Ratchet\Server\IoServer;
 use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 use Socket\Message;
 //use React\Socket\Server as Reactor;
 
 require_once dirname(__FILE__) . '/../../videos/configuration.php';
 require_once $global['systemRootPath'] . 'plugin/YPTSocket/Message.php';
 require_once $global['systemRootPath'] . 'objects/autoload.php';
 
 if (!isCommandLineInterface()) {
     die("Command line only");
 }
 
 $SocketDataObj = AVideoPlugin::getDataObject("YPTSocket");
 $SocketDataObj->serverVersion = YPTSocket::getServerVersion();
 
 ob_end_flush();
 _mysql_close();
 session_write_close();
 
 killProcessOnPort();
 
 exec('certbot renew');
-exec("sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/serverRestart.php &");
+exec("sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &");