diff --git a/mars/build_watch.py b/mars/build_watch.py
index 9ca9673d6..c8c4444fc 100755
--- a/mars/build_watch.py
+++ b/mars/build_watch.py
@@ -11,18 +11,18 @@
 BUILD_OUT_PATH = 'cmake_build/watchos'
 INSTALL_PATH = os.path.join(BUILD_OUT_PATH, 'watchOS.out')
 
-WATCH_BUILD_SIMULATOR_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DPLATFORM=SIMULATOR_WATCHOS -DIOS_DEPLOYMENT_TARGET=2.0 -DARCH="i386" -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DENABLE_VISIBILITY=1 && make -j8 && make install'
-WATCH_BUILD_OS_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DPLATFORM=WATCHOS -DIOS_DEPLOYMENT_TARGET=2.0 -DARCH="armv7k;arm64_32" -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DENABLE_VISIBILITY=1 && make -j8 && make install'
+WATCH_BUILD_SIMULATOR_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DPLATFORM=SIMULATOR_WATCHOS -DIOS_DEPLOYMENT_TARGET=2.0 -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DENABLE_VISIBILITY=1 && make -j8 && make install'
+WATCH_BUILD_OS_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DPLATFORM=WATCHOS -DIOS_DEPLOYMENT_TARGET=2.0 -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DENABLE_VISIBILITY=1 && make -j8 && make install'
 
-GEN_WATCH_OS_PROJ = 'cmake ../.. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DIOS_PLATFORM=OS -DIOS_DEPLOYMENT_TARGET=2.0 -DIOS_ARCH="armv7;arm64" -DCMAKE_XCODE_ATTRIBUTE_VALID_ARCHS="armv7k;arm64_32" -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DENABLE_VISIBILITY=1'
+GEN_WATCH_OS_PROJ = 'cmake ../.. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DPLATFORM=OS -DIOS_DEPLOYMENT_TARGET=2.0 -DIOS_ARCH="armv7;arm64" -DCMAKE_XCODE_ATTRIBUTE_VALID_ARCHS="armv7k;arm64_32;arm64" -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DENABLE_VISIBILITY=1'
 
 
 def build_watch(tag=''):
     gen_mars_revision_file('comm', tag)
-    
+
     clean(BUILD_OUT_PATH)
     os.chdir(BUILD_OUT_PATH)
-    
+
     ret = os.system(WATCH_BUILD_OS_CMD)
     os.chdir(SCRIPT_PATH)
     if ret != 0:
@@ -30,7 +30,11 @@ def build_watch(tag=''):
         return False
 
     libtool_os_dst_lib = INSTALL_PATH + '/os'
-    if not libtool_libs(glob.glob(INSTALL_PATH + '/*.a'), libtool_os_dst_lib):
+    libtool_src_libs = [INSTALL_PATH + '/libcomm.a',
+                        INSTALL_PATH + '/libmars-boost.a',
+                        INSTALL_PATH + '/libxlog.a',
+                        BUILD_OUT_PATH + '/zstd/libzstd.a']
+    if not libtool_libs(libtool_src_libs, libtool_os_dst_lib):
         return False
 
     clean(BUILD_OUT_PATH)
@@ -40,21 +44,26 @@ def build_watch(tag=''):
     if ret != 0:
         print('!!!!!!!!!!!build simulator fail!!!!!!!!!!!!!!!')
         return False
-    
-    libtool_simulator_dst_lib = INSTALL_PATH + '/simulator'
-    if not libtool_libs(glob.glob(INSTALL_PATH + '/*.a'), libtool_simulator_dst_lib):
-        return False
-
-    lipo_src_libs = []
-    lipo_src_libs.append(libtool_os_dst_lib)
-    lipo_src_libs.append(libtool_simulator_dst_lib)
-    lipo_dst_lib = INSTALL_PATH + '/mars'
 
-    if not lipo_libs(lipo_src_libs, lipo_dst_lib):
+    libtool_simulator_dst_lib = INSTALL_PATH + '/simulator'
+    if not libtool_libs(libtool_src_libs, libtool_simulator_dst_lib):
         return False
 
-    dst_framework_path = INSTALL_PATH + '/mars.framework'
-    make_static_framework(lipo_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../')
+    dst_framework_path = INSTALL_PATH + '/out/mars.xcframework'
+    dst_framework_device_path = INSTALL_PATH + '/device/mars.framework'
+    make_static_framework(libtool_os_dst_lib, dst_framework_device_path, XLOG_COPY_HEADER_FILES, '../')
+    src = os.path.join(dst_framework_device_path, 'os')
+    dst = os.path.join(dst_framework_device_path, 'mars')
+    if os.path.exists(src):
+        os.rename(src, dst)
+
+    dst_framework_simulator_path = INSTALL_PATH + '/simu/mars.framework'
+    make_static_framework(libtool_simulator_dst_lib, dst_framework_simulator_path, XLOG_COPY_HEADER_FILES, '../')
+    src = os.path.join(dst_framework_simulator_path, 'simulator')
+    dst = os.path.join(dst_framework_simulator_path, 'mars')
+    if os.path.exists(src):
+        shutil.move(src, dst)
+    os.system('xcodebuild -create-xcframework -framework "' + dst_framework_device_path + '" -framework "' + dst_framework_simulator_path + '" -output "' + dst_framework_path + '"')
 
     print('==================Output========================')
     print(dst_framework_path)
diff --git a/mars/openssl/include/openssl/opensslconf-apple.h b/mars/openssl/include/openssl/opensslconf-apple.h
index e50d05a51..dae81c5b3 100755
--- a/mars/openssl/include/openssl/opensslconf-apple.h
+++ b/mars/openssl/include/openssl/opensslconf-apple.h
@@ -18,6 +18,8 @@
 # include <openssl/opensslconf_watchos_arm64_32.h>
 #elif TARGET_OS_WATCH && TARGET_OS_SIMULATOR && TARGET_CPU_X86
 # include <openssl/opensslconf_watchos_sim_i386.h>
+#elif TARGET_OS_WATCH && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64
+# include <openssl/opensslconf_watchos_sim_x86_64.h>
 #elif TARGET_OS_OSX && TARGET_CPU_X86_64
 # include <openssl/opensslconf_macos_x86_64.h>
 #elif TARGET_OS_OSX && TARGET_CPU_ARM64