diff --git a/PKGBUILD b/PKGBUILD
index d14c8ce..b102b89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
 pkgname=update-notify
-pkgver=1.3
+pkgver=2.0
 pkgrel=1
 pkgdesc='Notify when updates are available'
 arch=('any')
@@ -15,7 +15,7 @@ makedepends=('git')
 optdepends=('git-monitor: to check git repos for updates')
 source=(git+${url}?signed#tag=${pkgver})
 validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('702c0b271b2e9e519869f0face4fdcefe55f923d0379f39fd66af32404d2cd0e')
+sha256sums=('907b2f1ad229096dc520a65e8e4319dba575a759d2e23248aff810e01d0c4a02')
 
 package()
 {
diff --git a/update-notify b/update-notify
index 8862e88..321c923 100755
--- a/update-notify
+++ b/update-notify
@@ -1,51 +1,69 @@
 #!/bin/bash
 
-check_git_monitor()
-{
-    command -v git-monitor > /dev/null
-    echo "$?"
+# Default threshold or user argument
+threshold=${1:-30}
+
+# Fetch checkupdates once to prevent multiple network/disk calls
+mapfile -t arch_list < <(checkupdates 2>/dev/null)
+arch_updates=${#arch_list[@]}
+
+# Count AUR updates safely
+aur_updates=$(aur repo -u -d aur-local 2>/dev/null | wc -l)
+updates=$((arch_updates + aur_updates))
+
+# Check kernel running environment
+running_kernel=$(uname -r)
+is_lts=0; [[ $running_kernel == *lts* ]] && is_lts=1
+
+# Convert the array to a single string for quick regex matching
+arch_str="${arch_list[*]}"
+
+# Check for custom package updates in the list
+has_custom=0;     [[ $arch_str == *linux-custom* ]] && has_custom=1
+has_custom_lts=0; [[ $arch_str == *linux-lts-custom* ]] && has_custom_lts=1
+
+# Define localized logic for kernel checking
+check_kernel_update() {
+    local pkg=$1
+    local item
+
+    # Precise array element matching (avoids false-positive substring matches)
+    for item in "${arch_list[@]}"; do
+        if [[ "$item" == "$pkg "* ]]; then
+            return 0 # Package found in the updates array, update is definitely available
+        fi
+    done
+
+    # Fallback to vercmp if running kernel doesn't match the sync repo
+    local repo_ver
+    repo_ver=$(pacman -Si "$pkg" 2>/dev/null | awk -F': ' '/Version/ {print $2}')
+
+    # Crucial Fix: vercmp returns > 0 ONLY if repo_ver is strictly newer than running_kernel
+    if [[ -n $repo_ver ]] && (( $(vercmp "$repo_ver" "$running_kernel") > 0 )); then
+        return 0
+    fi
+    return 1
 }
 
-if [ "$#" -eq 1 ]; then
-    threshold=$1
-else
-    threshold=30
+# Evaluate Kernel notifications based on environment
+if (( is_lts == 0 && has_custom == 0 )); then
+    check_kernel_update "linux" && notify-send "Kernel update available" "Rebuild custom kernel"
+elif (( is_lts == 1 && has_custom_lts == 0 )); then
+    check_kernel_update "linux-lts" && notify-send "LTS Kernel update available" "Rebuild custom kernel"
 fi
 
-arch_updates=$(checkupdates | wc -l)
-aur_updates=$(aur repo -u -d aur-local | wc -l)
-kernel_update=$(checkupdates | grep linux | grep -v custom | grep -v archlinux | grep -v api | grep -v firmware | grep -v util | wc -l)
-kernel_update_lts=$(checkupdates | grep linux-lts | grep -v custom | wc -l)
-git_monitor=$(check_git_monitor)
-lts_kernel=$(uname -r | grep lts | wc -l)
 
-if [ "$kernel_update" -eq 0 ] && [ "$lts_kernel" -eq 0 ]; then
-    kernel_update=$(vercmp `pacman -Si linux | grep Version | cut -d':' -f2` `uname -r`)
-fi
-
-if [ "$kernel_update_lts" -eq 0 ] && [ "$lts_kernel" -eq 1 ]; then
-    kernel_update_lts=$(vercmp `pacman -Si linux-lts | grep Version | cut -d':' -f2` `uname -r`)
-fi
-
-built_kernel=$(checkupdates | grep linux-custom | wc -l)
-built_kernel_lts=$(checkupdates | grep linux-lts-custom | wc -l)
-
-updates=$(($arch_updates + $aur_updates))
-
-if [ "$kernel_update" -ge 1 ] && [ "$built_kernel" -eq 0 ] && [ "$lts_kernel" -eq 0 ]; then
-    notify-send "Kernel update available" "Rebuild custom kernel"
-fi
-
-if [ "$kernel_update_lts" -ge 1 ] && [ "$built_kernel_lts" -eq 0 ] && [ "$lts_kernel" -eq 1 ]; then
-    notify-send "LTS Kernel update available" "Rebuild custom kernel"
-fi
-
-if [ "$updates" -ge "$threshold" ]; then
+# Main updates notification threshold logic
+if (( updates >= threshold )); then
     notify-send "Updates available" "Arch: $arch_updates, AUR: $aur_updates"
 
-    if [ "$git_monitor" -eq 0 ]; then
+    # Directly check command availability inline (no function needed)
+    if command -v git-monitor >/dev/null 2>&1; then
         notify-send "Check git packages" "Use git-monitor for git packages updates"
     fi
 
-    notify-send "Check firmware" "Use fwupdmgr to check for firmware updates"
+    if command -v fwupdmgr >/dev/null 2>&1; then
+        notify-send "Check firmware" "Use fwupdmgr to check for firmware updates"
+    fi
 fi
+