diff --git a/V2rayU/ConfigWindow.swift b/V2rayU/ConfigWindow.swift
index 39f1981..109eec1 100644
--- a/V2rayU/ConfigWindow.swift
+++ b/V2rayU/ConfigWindow.swift
@@ -182,6 +182,8 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
                     self.serversTableView.reloadData()
                     // selected current row
                     self.serversTableView.selectRowIndexes(NSIndexSet(index: V2rayServer.count() - 1) as IndexSet, byExtendingSelection: false)
+                    
+                    menuController.showServers()
                 }
                 break
                 
diff --git a/V2rayU/MainMenu.swift b/V2rayU/MainMenu.swift
index 77828ca..6c85eba 100644
--- a/V2rayU/MainMenu.swift
+++ b/V2rayU/MainMenu.swift
@@ -36,6 +36,8 @@ class MenuController: NSObject, NSMenuDelegate {
 
         // hide new version
         newVersionItem.isHidden = true
+        
+        showRouting()
 
         // windowWillClose Notification
         NotificationCenter.default.addObserver(self, selector: #selector(configWindowWillClose(notification:)), name: NSWindow.willCloseNotification, object: nil)
@@ -130,13 +132,12 @@ class MenuController: NSObject, NSMenuDelegate {
                 configWindow.reloadData()
             }
         }
-        showRouting()
     }
 
     func showRouting() {
         DispatchQueue.global().async {
             let rules = V2rayRoutings.all()
-            print("showRouting", rules)
+//            print("showRouting", rules)
             let sumMenus = NSMenu()
             // add Routing... menu and click event is goRouting
             let routingMenuItem = NSMenuItem()
@@ -165,7 +166,7 @@ class MenuController: NSObject, NSMenuDelegate {
                 }
                 sumMenus.addItem(menuItem)
             }
-            print("showRouting", sumMenus)
+//            print("showRouting", sumMenus)
             // 假设 routingMenu 已经连接并且有一个子菜单
             DispatchQueue.main.async {
                 self.routingMenu.submenu = sumMenus
diff --git a/V2rayU/Ping.swift b/V2rayU/Ping.swift
index 6398aea..aa55c29 100644
--- a/V2rayU/Ping.swift
+++ b/V2rayU/Ping.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2019 yanue. All rights reserved.
 //
 
+import Foundation
+
 // ping and choose fastest v2ray
 var inPing = false
 var inPingCurrent = false
@@ -14,50 +16,51 @@ var ping = PingSpeed()
 let second: Double = 1000000
 let pingURL = URL(string: "http://www.gstatic.com/generate_204")!
 
+func getRandomPort() -> UInt16 {
+    return UInt16.random(in: 49152...65535)
+}
+
 class PingSpeed: NSObject {
     let maxConcurrentTasks = 30
 
     func pingAll() {
         NSLog("ping start")
-        if inPing {
+        guard !inPing else {
             NSLog("ping inPing")
             return
         }
-        
-        // make sure core file
+
         V2rayLaunch.checkV2rayCore()
-        // in ping
+
         inPing = true
-        
         killAllPing()
-        
+
         let itemList = V2rayServer.all()
-        if itemList.count == 0 {
+        guard !itemList.isEmpty else {
             NSLog("no items")
             inPing = false
             return
         }
-        var pingTip: String = ""
-        if isMainland {
-            pingTip = "Ping Speed - In Testing "
-        } else {
-            pingTip = "Ping Speed - 测试中"
-        }
+
+        let pingTip = isMainland ? "Ping Speed - In Testing" : "Ping Speed - 测试中"
         menuController.setStatusMenuTip(pingTip: pingTip)
+
         Task {
             do {
                 try await pingTaskGroup(items: itemList)
-            } catch let error {
+            } catch {
                 NSLog("pingTaskGroup error: \(error)")
             }
         }
+        NSLog("pingAll")
     }
-    
-    func pingTaskGroup(items: [V2rayItem]) async throws  {
+
+    func pingTaskGroup(items: [V2rayItem]) async throws {
         let taskChunks = stride(from: 0, to: items.count, by: maxConcurrentTasks).map {
             Array(items[$0..<min($0 + maxConcurrentTasks, items.count)])
         }
         NSLog("pingTaskGroup-start: taskChunks=\(taskChunks.count)")
+
         for (i, chunk) in taskChunks.enumerated() {
             NSLog("pingTaskGroup-start-\(i): count=\(chunk.count)")
             try await withThrowingTaskGroup(of: Void.self) { group in
@@ -68,119 +71,94 @@ class PingSpeed: NSObject {
                         } catch {
                             NSLog("pingEachServer error: \(error)")
                         }
-                        return
                     }
                 }
-                
-                // 等待当前批次所有任务完成
                 try await group.waitForAll()
             }
             NSLog("pingTaskGroup-end-\(i)")
         }
         NSLog("pingTaskGroup-end")
-        self.pingEnd()
+        pingEnd()
     }
 
     func pingEachServer(item: V2rayItem) async throws {
         NSLog("pingEachServer: \(item.name) - \(item.remark)")
-        if !item.isValid {
-            return
-        }
-        // ping
+        guard item.isValid else { return }
+
         let t = PingServer(item: item)
         try await t.doPing()
     }
 
     func pingEnd() {
         inPing = false
-        var pingTip: String = "Ping"
-        print("pingEnd", pingTip)
+        let pingTip = "Ping"
+        NSLog("pingEnd: \(pingTip)")
         menuController.setStatusMenuTip(pingTip: pingTip)
         menuController.showServers()
-        // kill
         killAllPing()
     }
 }
 
 class PingServer: NSObject, URLSessionDataDelegate {
     var item: V2rayItem
-
     var bindPort: UInt16 = 0
     var jsonFile: String = ""
     var process: Process = Process()
 
     init(item: V2rayItem) {
         self.item = item
-        super.init() // can actually be omitted in this example because will happen automatically.
+        super.init()
     }
 
     func doPing() async throws {
-        let (_, _bindPort) = getUsablePort(port: uint16(Int.random(in: 9000 ... 36500)))
-
-        NSLog("doPing: \(item.name)-\(item.remark) - \(_bindPort)")
-        bindPort = _bindPort
-        
+        bindPort = getRandomPort()
         let _json_file = ".\(item.name).json"
         jsonFile = AppHomePath + "/" + _json_file
 
-        // create v2ray config file
         createV2rayJsonFileForPing()
-        // 创建管道
-        let processPipe = Pipe()
-        // Create a Process instance with async launch
-        // use `/bin/bash -c cmd ...` and need kill subprocess
+
         let pingCmd = "cd \(AppHomePath) && ./v2ray-core/v2ray run -config \(_json_file)"
         NSLog("pingCmd: \(pingCmd)")
+
         process.launchPath = "/bin/bash"
         process.arguments = ["-c", pingCmd]
-        process.standardError = processPipe
-        process.standardOutput = processPipe
         process.terminationHandler = { _process in
-            // 结束子进程
             if _process.terminationStatus != EXIT_SUCCESS {
-                NSLog("process is not kill \(_bindPort) - \(_process.description) -  \(_process.processIdentifier) - \(_process.terminationStatus)")
+                NSLog("process is not kill \(self.bindPort) - \(_process.description) -  \(_process.processIdentifier) - \(_process.terminationStatus)")
                 _process.terminate()
                 _process.waitUntilExit()
             }
         }
-        // async launch and can't waitUntilExit
-        process.launch()
 
-        // sleep for wait v2ray process instanse
+        process.launch()
         usleep(useconds_t(2 * second))
 
         let session = URLSession(configuration: getProxyUrlSessionConfigure(httpProxyPort: bindPort), delegate: self, delegateQueue: nil)
         do {
-            let (_,_) = try await session.data(for: URLRequest(url: pingURL))
-        } catch let error {
-            // failed to write file – bad permissions, bad filename, missing permissions, or more likely it can't be converted to the encoding
+            _ = try await session.data(for: URLRequest(url: pingURL))
+        } catch {
             NSLog("session request fail: \(error)")
         }
     }
 
     func createV2rayJsonFileForPing() {
         var jsonText = item.json
-        // parse old
         let vCfg = V2rayConfig()
-        vCfg.enableSocks = false // just can use one tcp port
+        vCfg.enableSocks = false
         vCfg.parseJson(jsonText: item.json)
         vCfg.httpHost = "127.0.0.1"
         vCfg.socksHost = "127.0.0.1"
         vCfg.httpPort = String(bindPort)
-        vCfg.socksPort = String(bindPort + 1) // can't same with http port
-        // combine new default config
+        vCfg.socksPort = String(bindPort + 1)
         jsonText = vCfg.combineManual()
 
         do {
             let jsonFilePath = URL(fileURLWithPath: jsonFile)
-            // delete before config
             if FileManager.default.fileExists(atPath: jsonFile) {
                 try FileManager.default.removeItem(at: jsonFilePath)
             }
-            // write
-            try jsonText.write(to: jsonFilePath, atomically: true, encoding: String.Encoding.utf8)
-        } catch let error {
-            // failed to write file – bad permissions, bad filename, missing permissions, or more likely it can't be converted to the encoding
+            try jsonText.write(to: jsonFilePath, atomically: true, encoding: .utf8)
+        } catch {
             NSLog("save json file fail: \(error)")
         }
     }
@@ -192,161 +170,163 @@ class PingServer: NSObject, URLSessionDataDelegate {
         if let transactionMetrics = metrics.transactionMetrics.first {
             let fetchStartDate = transactionMetrics.fetchStartDate
             let responseEndDate = transactionMetrics.responseEndDate
-            // check
-            if responseEndDate != nil && fetchStartDate != nil {
-                let requestDuration = responseEndDate!.timeIntervalSince(fetchStartDate!)
+            if let fetchStartDate = fetchStartDate, let responseEndDate = responseEndDate {
+                let requestDuration = responseEndDate.timeIntervalSince(fetchStartDate)
                 let pingTs = Int(requestDuration * 100)
-                print("PingResult: fetchStartDate=\(fetchStartDate!),responseEndDate=\(responseEndDate!),requestDuration=\(requestDuration),pingTs=\(pingTs)")
-                // update ping speed
-                item.speed = String(format: "%d", pingTs) + "ms"
+                NSLog("PingResult: fetchStartDate=\(fetchStartDate), responseEndDate=\(responseEndDate), requestDuration=\(requestDuration), pingTs=\(pingTs)")
+                item.speed = String(format: "%dms", pingTs)
             }
         }
-        // save
         item.store()
         pingEnd()
     }
 
     func pingEnd() {
         NSLog("ping end: \(item.remark) - \(item.speed)")
-
-        // delete config
         do {
-            // exit process
             if process.isRunning {
-                // terminate v2ray process
                 process.interrupt()
                 process.terminate()
                 process.waitUntilExit()
             }
-            // close port
-            print("remove ping config:", jsonFile)
             try FileManager.default.removeItem(at: URL(fileURLWithPath: jsonFile))
-        } catch let error {
-            print("remove ping config error: \(error)")
+        } catch {
+            NSLog("remove ping config error: \(error)")
         }
     }
 }
 
 class PingCurrent: NSObject, URLSessionDataDelegate {
-    var item: V2rayItem
+    static let shared = PingCurrent()
+
+    var item: V2rayItem?
     var tryPing = 0
+    var inPingProcess = false
 
-    init(item: V2rayItem) {
+    private override init() {
+        super.init()
+    }
+
+    func startPing(with item: V2rayItem) {
+        guard !inPingProcess else {
+            return
+        }
         self.item = item
-        super.init() // can actually be omitted in this example because will happen automatically.
+        tryPing = 0
+        doPing()
     }
 
-    func doPing()  {
+    private func doPing() {
+        guard let item = item else { return }
+
+        inPingProcess = true
         Task {
             do {
                 try await _doPing()
                 pingCurrentEnd()
-            } catch let error {
+            } catch {
                 NSLog("doPing error: \(error)")
+                inPingProcess = false
             }
         }
     }
     
-    func _doPing() async throws {
-        inPingCurrent = true
-        usleep(useconds_t(1 * second))
-        NSLog("PingCurrent start: try=\(tryPing),item=\(item.remark)")
-        // set URLSessionDataDelegate
+    private func _doPing() async throws {
+        usleep(useconds_t(1 * second)) // 1 second
+        guard let item = item else { return }
+        NSLog("PingCurrent start: try=\(tryPing), item=\(item.remark)")
+        
         let config = getProxyUrlSessionConfigure()
         config.timeoutIntervalForRequest = 3
-        // url request
+        
         let session = URLSession(configuration: config, delegate: self, delegateQueue: nil)
         tryPing += 1
+        
         do {
-            let (_,_) = try await session.data(for: URLRequest(url: pingURL))
-        } catch let error {
-            // failed to write file – bad permissions, bad filename, missing permissions, or more likely it can't be converted to the encoding
+            let (_, _) = try await session.data(for: URLRequest(url: pingURL))
+        } catch {
             NSLog("save json file fail: \(error)")
         }
     }
 
-    // MARK: - URLSessionDataDelegate
-
     func urlSession(_ session: URLSession, task: URLSessionTask, didFinishCollecting metrics: URLSessionTaskMetrics) {
+        guard let item = item else { return }
+
         item.speed = "-1ms"
-        if let transactionMetrics = metrics.transactionMetrics.first {
-            let fetchStartDate = transactionMetrics.fetchStartDate
-            let responseEndDate = transactionMetrics.responseEndDate
-            // check
-            if responseEndDate != nil && fetchStartDate != nil {
-                let requestDuration = responseEndDate!.timeIntervalSince(fetchStartDate!)
-                let pingTs = Int(requestDuration * 100)
-                print("PingCurrent: fetchStartDate=\(fetchStartDate!),responseEndDate=\(responseEndDate!),requestDuration=\(requestDuration),pingTs=\(pingTs)")
-                // update ping speed
-                item.speed = String(format: "%d", pingTs) + "ms"
-            }
+        if let transactionMetrics = metrics.transactionMetrics.first,
+           let fetchStartDate = transactionMetrics.fetchStartDate,
+           let responseEndDate = transactionMetrics.responseEndDate {
+            let requestDuration = responseEndDate.timeIntervalSince(fetchStartDate)
+            let pingTs = Int(requestDuration * 100)
+            print("PingCurrent: fetchStartDate=\(fetchStartDate), responseEndDate=\(responseEndDate), requestDuration=\(requestDuration), pingTs=\(pingTs)")
+            item.speed = "\(pingTs)ms"
         }
-        // save
         item.store()
     }
 
-    func pingCurrentEnd() {
-        NSLog("PingCurrent end: try=\(tryPing),item=\(item.remark)")
-        // ping current fail
+    private func pingCurrentEnd() {
+        guard let item = item else { return }
+
+        NSLog("PingCurrent end: try=\(tryPing), item=\(item.remark)")
         if item.speed == "-1ms" {
             if tryPing < 3 {
-                usleep(useconds_t(3 * second))
-                doPing()
+                inPingProcess = false
+                DispatchQueue.global().asyncAfter(deadline: .now() + 3) {
+                    self.doPing()
+                }
             } else {
-                // choose next server
                 chooseNewServer()
             }
         } else {
-            inPingCurrent = false
+            inPingProcess = false
             menuController.showServers()
         }
     }
 
-    func chooseNewServer() {
-        if !UserDefaults.getBool(forKey: .autoSelectFastestServer) {
+    private func chooseNewServer() {
+        guard let item = item else {
+            inPingProcess = false
+            return
+        }
+
+        guard UserDefaults.getBool(forKey: .autoSelectFastestServer) else {
             NSLog(" - choose new server: disabled")
+            inPingProcess = false
             return
         }
-        do {
-            let serverList = V2rayServer.all()
-            if serverList.count > 1 {
-                var pingedSvrs: Dictionary = [String: Int]()
-                var allSvrs = [String]()
-                for svr in serverList {
-                    if svr.name == item.name {
-                        continue
-                    }
-                    allSvrs.append(svr.name)
-                    if svr.isValid && svr.speed != "-1ms" {
-                        var speed = svr.speed
-                        // suffix substring or not
-                        let suffixStr = "ms"
-                        if speed.hasSuffix(suffixStr) {
-                            // Find the index to stop deleting at
-                            let LIndex = speed.index(speed.endIndex, offsetBy: -suffixStr.count)
-                            // Removing the suffix substring
-                            speed = String(speed[..<LIndex])
-                        }
-                        pingedSvrs[svr.name] = Int(speed)
-                    }
-                }
-                var newSvrName = ""
-                if pingedSvrs.count > 0 {
-                    // sort by ping seed
-                    let sortPing = pingedSvrs.sorted(by: { $0.value < $1.value })
-                    newSvrName = sortPing[0].key
-                } else {
-                    // 修复越界问题
-                    let idx = Int.random(in: 0 ... allSvrs.count-1)
-                    newSvrName = allSvrs[idx]
+        
+        let serverList = V2rayServer.all()
+        guard serverList.count > 1 else {
+            inPingProcess = false
+            return
+        }
+
+        var pingedSvrs = [String: Int]()
+        var allSvrs = [String]()
+        
+        for svr in serverList where svr.name != item.name {
+            allSvrs.append(svr.name)
+            if svr.isValid && svr.speed != "-1ms" {
+                let speed = svr.speed.replacingOccurrences(of: "ms", with: "")
+                if let speedInt = Int(speed) {
+                    pingedSvrs[svr.name] = speedInt
                 }
-                NSLog(" - choose new server: \(newSvrName)")
-                // set current
-                UserDefaults.set(forKey: .v2rayCurrentServerName, value: newSvrName)
-                // restart
-                V2rayLaunch.restartV2ray()
             }
-            inPingCurrent = false
         }
+
+        let newSvrName: String
+        if let fastestSvr = pingedSvrs.sorted(by: { $0.value < $1.value }).first {
+            newSvrName = fastestSvr.key
+        } else if let randomSvr = allSvrs.randomElement() {
+            newSvrName = randomSvr
+        } else {
+            inPingProcess = false
+            return
+        }
+
+        NSLog(" - choose new server: \(newSvrName)")
+        UserDefaults.set(forKey: .v2rayCurrentServerName, value: newSvrName)
+        V2rayLaunch.restartV2ray()
+        inPingProcess = false
     }
 }
diff --git a/V2rayU/V2rayLaunch.swift b/V2rayU/V2rayLaunch.swift
index dab6418..811b462 100644
--- a/V2rayU/V2rayLaunch.swift
+++ b/V2rayU/V2rayLaunch.swift
@@ -278,7 +278,7 @@ class V2rayLaunch: NSObject {
         menuController.showServers()
 
         // ping current
-        PingCurrent(item: v2ray).doPing()
+        PingCurrent.shared.startPing(with: v2ray)
     }
 
     static func stopV2rayCore() {
diff --git a/V2rayU/V2rayRouting.swift b/V2rayU/V2rayRouting.swift
index 445c3e0..39e6f24 100644
--- a/V2rayU/V2rayRouting.swift
+++ b/V2rayU/V2rayRouting.swift
@@ -437,7 +437,7 @@ class RoutingItem: NSObject, NSCoding {
             }
         }
 
-        print("ips", ips, "domains", domains)
+//        print("ips", ips, "domains", domains)
 
         return (domains, ips)
     }