diff --git a/.github/workflows/perform_precheck.sh b/.github/workflows/perform_precheck.sh
index 56bd4ab..2dd28a6 100644
--- a/.github/workflows/perform_precheck.sh
+++ b/.github/workflows/perform_precheck.sh
@@ -15,8 +15,8 @@ echo "[Info] All files are uncompressed"
 AddLine="use fpga_top fpga_top_uut\n"\
 "transform 1 0 0 0 1 0\n"\
 "box 0 0 2500 3000"
-sed -i "s/<< properties >>/${AddLine}\n<< properties >>/" ./mag/user_project_wrapper.mag
-echo "[Info] Merged with user_project_wrapper"
+sed -i "s/<< properties >>/${AddLine}\n<< properties >>/" ./mag/user_project_wrapper_empty.mag
+echo "[Info] Updated user_project_wrapper_empty"
 
 # = = = Running magic to merge fpga_top with user_project_wrapper = = = = = =  =
 [ ! -d "/usr/local/workspace/${DEST_DIR}/checks" ] && mkdir /usr/local/workspace/${DEST_DIR}/checks
@@ -26,14 +26,18 @@ magic -rcfile ${PDK_ROOT}/sky130A/libs.tech/magic/current/sky130A.magicrc \
 ../SOFA-Chips/SCRIPT/merge_fpga_top.tcl </dev/null > \
 /usr/local/workspace/${DEST_DIR}/checks/magic_merge_user_project_wrapper.log
 
+git reset ./mag/user_project_wrapper_empty.mag
 echo "[Info] merge fpga-top"
 
 # = = = = = = = = = = Build Caravel with Klayout = = = = = = = = = = = = = = =
-klayout -r ../SOFA-Chips/SCRIPT/merge_caravel_klayout.py -zz
+klayout -r ../SOFA-Chips/SCRIPT/merge_caravel_klayout.py -zz > \
+/usr/local/workspace/${DEST_DIR}/checks/KlayoutMerge.log
 echo "[Info] Finished shiping chip with Klayout"
 rm -rf ./gds/fpga_top*
 rm -rf ./gds/user_project_wrapper_empty.gds
 rm -rf ./gds/user_proj_example.gds
+rm -rf .travis*
+rm -f .travis.yml
 mv ./gds/caravel_merged.gds ./gds/caravel.gds
 
 # = = = = = = = = =  Build Caravel with Magic = = = = = = = = = = = = = = = = =
@@ -52,6 +56,7 @@ if [[ "$SKIP_PRECHECK" != 1 ]]; then
         --pdk_root $PDK_ROOT ${PRECHECKER_OPTS}
     echo "[Info] Finished MPW Prechecker"
 else
+    make compress
     echo "[Info] Skipped MPW Prechecker"
 fi
 
@@ -69,3 +74,4 @@ rm -rf user_project_wrapper.mag
 rm -rf gds/caravel.mag
 rm -rf magic_drc.log
 git checkout HEAD -- ./mag/user_project_wrapper.mag
+git checkout HEAD -- ./mag/user_project_wrapper.mag
\ No newline at end of file
diff --git a/SCRIPT/merge_fpga_top.tcl b/SCRIPT/merge_fpga_top.tcl
index c3516c0..f1cbe4b 100644
--- a/SCRIPT/merge_fpga_top.tcl
+++ b/SCRIPT/merge_fpga_top.tcl
@@ -4,7 +4,7 @@ gds rescale false
 gds merge yes
 
 gds read ./gds/fpga_top_icv_in_design.gds
-load ./mag/user_project_wrapper.mag
+load ./mag/user_project_wrapper_empty.mag
 
 save user_project_wrapper