diff --git a/setup/fedora b/setup/fedora
index 89a7806..87c5924 100755
--- a/setup/fedora
+++ b/setup/fedora
@@ -19,17 +19,38 @@ sudo dnf makecache
 sudo dnf up -y
 }
 
+get_waydroid_inithelp() {
+    clear
+    echo '------------------------------------------------------------------------------------
+ Commands to run and URL to register your WayDroid to Google Services Central (GSC)
+------------------------------------------------------------------------------------
+
+> Run theses commands (order is important) in your shell :
+
+waydroid session start &
+sudo waydroid shell
+
+> Run this command after starting waydroid shell :
+
+ANDROID_RUNTIME_ROOT=/apex/com.android.runtime ANDROID_DATA=/data ANDROID_TZDATA_ROOT=/apex/com.android.tzdata ANDROID_I18N_ROOT=/apex/com.android.i18n sqlite3 /data/data/com.google.android.gsf/databases/gservices.db "select * from main where name = \"android_id\";"
+exit
+
+> Copy the ID printed (only the numbers), then paste on https://www.google.com/android/uncertified website (Google Account must be logged in, automatic within Google Chrome)
+ 
+> You can stop session using this commande :
+ 
+waydroid session stop
+'
+}
+
 setup_waydroid() {
+    if [ -x /usr/bin/waydroid ]; then
+    echo "> Waydroid is already installed. No action required, use Waydroid OTA to update it."
+    else
     sudo dnf in -y waydroid
     sudo waydroid init -s GAPPS -c "https://ota.waydro.id/system" -v "https://ota.waydro.id/vendor"
-    sudo waydroid session start
-    waydroid session start
-    sleep 5
-    sudo waydroid prop set persist.waydroid.multi_windows true
-    waydroid prop set persist.waydroid.multi_windows true
-    sleep 5
-    sudo waydroid session stop
-    waydroid session stop
+    get_waydroid_inithelp
+    fi
 }
 
 setup_netdata(){
@@ -664,7 +685,7 @@ echo -e "$BCyan-----------------------------------------------------------------
 |$BIYellow M  | Install/Update Gaming Packages                                     $BCyan|
 |$BIYellow B  | Install/Update BgGame Packages                                     $BCyan|
 |$BIYellow E  | Install/Update Emulators Packages                                  $BCyan|
-|$BIYellow D  | Install and Initialize WayDroid OTA                                $BCyan|
+|$BIYellow D  | Install and Initialize WayDroid OTA (Add H for help only)          $BCyan|
 --------------------------------------------------------------KDE-DESKTOP--$Color_Off$BCyan
 |$BBlue K0 | Install Plasma X11 Workspace                                       $BCyan|
 |$BBlue K1 | Install Plasma Mobile Workspace                                    $BCyan|
@@ -724,6 +745,17 @@ if [[ $choice = D ]]; then
     reload-script
 fi
 
+if [[ $choice = DH ]]; then
+    title="WayDroid Installation and Ignition (GAPPS)(HELP Only)"
+    header-show
+    wait-3s
+    enable-cmd-mode
+    get_waydroid_inithelp
+    disable-cmd-mode
+    wait-for-keypress
+    reload-script
+fi
+
 if [[ $choice = R ]]; then
     title="Register my system"
     header-show