diff --git a/script.sh b/script.sh
index ac3de4c..25abc21 100755
--- a/script.sh
+++ b/script.sh
@@ -15,79 +15,37 @@ sed 's/\// /g') | cut -f1) ] && echo -e "Klipper-backup is up to date\n" || echo
 
 # Check if backup folder exists, create one if it does not
 if [ ! -d "$backup_path" ]; then
-  mkdir -p "$backup_path"
-fi
-
-# cd to $HOME location, this keeps the script from adding /home/{username} to the folder structure when using --parents
-cd "$HOME"
-while IFS= read -r path; do
-  # Check if path is a directory or not a file (needed for /* checking as /* treats the path as not a directory)
-  if [[ -d "$HOME/$path" || ! -f "$HOME/$path" ]]; then
-  # Check if path does not end in /* or /
-    if [[ ! "$path" =~ /\*$ && ! "$path" =~ /$ ]]; then
-      path="$path/*"
-    elif [[ ! "$path" =~ \$ && ! "$path" =~ /\*$ ]]; then
-      path="$path*"
-    fi
-  fi
-  # Iterate over every file in the path
-  for file in $path; do
-    # Check if it's a symbolic link
-    if [ -h "$file" ]; then
-      echo "Skipping symbolic link: $file"
-      # Check if file is an extra backup of printer.cfg moonraker/klipper seems to like to make 4-5 of these sometimes no need to back them all up as well.
-    elif [[ $(basename "$file") =~ ^printer-[0-9]+_[0-9]+\.cfg$ ]]; then
-        echo "Skipping file: $file"
-    else
-      cp -r --parents "$file" "$backup_path/"
-    fi
-  done
-done < <(grep -v '^#' "$parent_path/.env" | grep 'path_' | sed 's/^.*=//')
-
-cp "$parent_path"/.gitignore "$backup_path/.gitignore"
-
-# Create and add Readme to backup folder
-echo -e "# klipper-backup 💾 \nKlipper backup script for manual or automated GitHub backups \n\nThis backup is provided by [klipper-backup](https://github.com/Staubgeborener/klipper-backup)." > "$backup_path/README.md"
-
-# Individual commit message, if no parameter is set, use the current timestamp as commit message
-timezone=$(timedatectl | grep "Time zone" | awk '{print $3}')
-if [ -n "$1" ]; then
-    commit_message="$1"
-elif [[ "$timezone" == *"America"* ]]; then
-    commit_message="New backup from $(date +"%m-%d-%y")"
-else
-    commit_message="New backup from $(date +"%d-%m-%y")"
+    mkdir -p "$backup_path"
 fi
 
 # Git commands
 cd "$backup_path"
 # Check if .git exists else init git repo
 if [ ! -d ".git" ]; then
-  mkdir .git
-  echo "[init]
-        defaultBranch = "$branch_name"" >> .git/config #Add desired branch name to config before init
-  git init
-
-# Check if the current checked out branch matches the branch name given in .env if not update to new branch
-elif [[ $(git symbolic-ref --short -q HEAD) != "$branch_name" ]]; then
-  echo "New branch in .env detected, rename $(git symbolic-ref --short -q HEAD) to $branch_name branch"
-  git branch -m "$branch_name"
+    mkdir .git
+    echo "[init]
+    defaultBranch = "$branch_name"" >> .git/config #Add desired branch name to config before init
+    git init
+    # Check if the current checked out branch matches the branch name given in .env if not update to new branch
+    elif [[ $(git symbolic-ref --short -q HEAD) != "$branch_name" ]]; then
+    echo "New branch in .env detected, rename $(git symbolic-ref --short -q HEAD) to $branch_name branch"
+    git branch -m "$branch_name"
 fi
 
 # Check if username is defined in .env
 if [[ "$commit_username" != "" ]]; then
-  git config user.name "$commit_username"
+    git config user.name "$commit_username"
 else
-  git config user.name "$(whoami)"
-  sed -i "s/^commit_username=.*/commit_username=\"$(whoami)\"/" "$parent_path"/.env
+    git config user.name "$(whoami)"
+    sed -i "s/^commit_username=.*/commit_username=\"$(whoami)\"/" "$parent_path"/.env
 fi
 
 # Check if email is defined in .env
 if [[ "$commit_email" != "" ]]; then
-  git config user.email "$commit_email"
+    git config user.email "$commit_email"
 else
-  git config user.email "$(whoami)@$(hostname --long)-$(git rev-parse --short HEAD)"
-  sed -i "s/^commit_email=.*/commit_email=\"$(whoami)@$(hostname --long)-$(git rev-parse --short HEAD)\"/" "$parent_path"/.env
+    git config user.email "$(whoami)@$(hostname --long)-$(git rev-parse --short HEAD)"
+    sed -i "s/^commit_email=.*/commit_email=\"$(whoami)@$(hostname --long)-$(git rev-parse --short HEAD)\"/" "$parent_path"/.env
 fi
 
 # Check if remote origin already exists and create if one does not
@@ -101,14 +59,62 @@ if [[ "$github_repository" != $(git remote get-url origin | sed 's/https:\/\/.*@
 fi
 
 git config advice.skippedCherryPicks false
-git add .
-git commit -m "$commit_message"
 
-# Only attempt to pull or push when actual changes were commited. cleaner output then pulling and pushing when already up to date.
-if [[ $(git rev-parse HEAD) != $(git ls-remote $(git rev-parse --abbrev-ref @{u} 2>/dev/null | sed 's/\// /g') | cut -f1) ]]; then
-  git pull origin "$branch_name" --rebase
-  git push -u origin "$branch_name"
+# Check if branch exists on remote (newly created repos will not yet have a remote) and pull any new changes
+if git ls-remote --exit-code --heads origin $branch_name > /dev/null 2>&1; then
+    git pull origin "$branch_name"
+    # Delete the pulled files so that the directory is empty again before copying the new backup
+    # The pull is only needed so that the repository nows its on latest and does not require rebases or merges
+    find "$backup_path" -maxdepth 1 -mindepth 1 ! -name '.git' -exec rm -rf {} \;
+fi
+
+cd "$HOME"
+while IFS= read -r path; do
+    # Check if path is a directory or not a file (needed for /* checking as /* treats the path as not a directory)
+    if [[ -d "$HOME/$path" || ! -f "$HOME/$path" ]]; then
+        # Check if path does not end in /* or /
+        if [[ ! "$path" =~ /\*$ && ! "$path" =~ /$ ]]; then
+            path="$path/*"
+            elif [[ ! "$path" =~ \$ && ! "$path" =~ /\*$ ]]; then
+            path="$path*"
+        fi
+    fi
+    # Check if path contains files
+    if compgen -G "$HOME/$path" > /dev/null; then
+        # Iterate over every file in the path
+        for file in $path; do
+            # Check if it's a symbolic link
+            if [ -h "$file" ]; then
+                echo "Skipping symbolic link: $file"
+                # Check if file is an extra backup of printer.cfg moonraker/klipper seems to like to make 4-5 of these sometimes no need to back them all up as well.
+                elif [[ $(basename "$file") =~ ^printer-[0-9]+_[0-9]+\.cfg$ ]]; then
+                echo "Skipping file: $file"
+            else
+                cp -r --parents "$file" "$backup_path/"
+            fi
+        done
+    fi
+done < <(grep -v '^#' "$parent_path/.env" | grep 'path_' | sed 's/^.*=//')
+
+cp "$parent_path"/.gitignore "$backup_path/.gitignore"
+
+# Create and add Readme to backup folder
+echo -e "# klipper-backup 💾 \nKlipper backup script for manual or automated GitHub backups \n\nThis backup is provided by [klipper-backup](https://github.com/Staubgeborener/klipper-backup)." > "$backup_path/README.md"
+
+# Individual commit message, if no parameter is set, use the current timestamp as commit message
+timezone=$(timedatectl | grep "Time zone" | awk '{print $3}')
+if [ -n "$1" ]; then
+    commit_message="$1"
+    elif [[ "$timezone" == *"America"* ]]; then
+    commit_message="New backup from $(date +"%m-%d-%y")"
+else
+    commit_message="New backup from $(date +"%d-%m-%y")"
 fi
 
+cd "$backup_path"
+git add .
+git commit -m "$commit_message"
+git push -u origin "$branch_name"
+
 # Remove files except .git folder after backup so that any file deletions can be logged on next backup
 find "$backup_path" -maxdepth 1 -mindepth 1 ! -name '.git' -exec rm -rf {} \;
\ No newline at end of file