diff --git a/run/install.sh b/run/install.sh
index 3ddf6ce..48ec952 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -97,8 +97,8 @@ PAT="/$BASE.pat"
 rm -f "$PAT"
 
 { wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
-(( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
 
+(( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
 [ ! -f "$PAT" ] && error "Failed to download $URL" && exit 69
 
 SIZE=$(stat -c%s "$PAT")
@@ -129,7 +129,6 @@ HDP="$TMP/synohdpack_img"
 [ ! -d "$PKG" ] && error "The PAT file contains no packages." && exit 68
 
 BOOT=$(find "$TMP" -name "*.bin.zip")
-
 [ ! -f "$BOOT" ] && error "The PAT file contains no boot file." && exit 67
 
 BOOT=$(echo "$BOOT" | head -c -5)
@@ -142,7 +141,6 @@ SYSTEM_SIZE=4954537983
 
 # Check free diskspace
 SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-
 (( SYSTEM_SIZE > SPACE )) && error "Not enough free space to create a 4 GB system disk." && exit 87
 
 if ! fallocate -l "${SYSTEM_SIZE}" "${SYSTEM}"; then
@@ -178,9 +176,11 @@ sfdisk -q "$SYSTEM" < "$PART"
 info "Install: Extracting system partition..."
 
 MOUNT="$TMP/system"
-
 rm -rf "$MOUNT" && mkdir -p "$MOUNT"
-mv -f "$HDA.tgz" "$HDA.txz"
+
+mv "$HDA.tgz" "$HDA.txz"
+mv "$PKG/" "$MOUNT/.SynoUpgradePackages/"
+rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight.spk"
 
 tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"
 tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/"
@@ -188,10 +188,6 @@ tar xpfJ "$IDB.txz" --absolute-names -C "$MOUNT/usr/syno/synoman/indexdb/"
 
 # Install Agent
 
-LOC="$MOUNT/usr/local"
-mkdir -p "$LOC"
-mv "$PKG/" "$LOC/"
-
 LOC="$MOUNT/usr/local/bin"
 mkdir -p "$LOC"
 cp /agent/agent.sh "$LOC/agent.sh"