diff --git a/ADconnection.sh b/ADconnection.sh
index 4a10b3d..0e5b5e4 100644
--- a/ADconnection.sh
+++ b/ADconnection.sh
@@ -158,42 +158,39 @@ echo "If this is wrong DO NOT REBOOT and contact sysadmin"
 debianclient(){
 export HOSTNAME
 myhost=$( hostname )
-sudo apt-get update
-sudo apt-get install libsss-sudo -y
 sudo apt-get install realmd adcli sssd -y
 sudo apt-get install ntp -y
-sudo mkdir -p /var/lib/samba/private
-clear 
-echo "Please enter the domain you wish to join: "
-read DOMAIN
-echo "Please enter Your domain’s NetBios name"
-read NetBios
+clear
+DOMAIN=$(realm discover | grep -i realm.name | cut -d ':' -f2 | sed -e 's/^[[:space:]]*//')
+echo "${NUMBER}I searched for an available domain and found >>> $DOMAIN  <<< ${END}"
+
+read -p "Do you wish to use it (y/n)?" yn
+   case $yn in
+    [Yy]* ) echo "Please log in with domain admin to $DOMAIN to connect";;
+
+    [Nn]* ) echo "Please enter the domain you wish to join:"
+	read DOMAIN;;
+    * ) echo 'Please answer yes or no.';;
+   esac
+NetBios=$(echo $DOMAIN | cut -d '.' -f1)
 echo "Please enter a domain admin login to use: "
 read ADMIN
-sudo realm join --user=$ADMIN $DOMAIN 
-if [ $? -ne 0 ]; then
-    echo "AD join failed.  Please run 'journalctl -xn' to determine why."
-    exit 1
-fi
+discovery=$(realm discover $DOMAIN | grep domain-name)
+clear
+sudo echo "${INTRO_TEXT}"Realm= $discovery"${INTRO_TEXT}"
+sudo echo "${NORMAL}${NORMAL}"
+sudo realm join --verbose --user=$ADMIN $DOMAIN
 sudo systemctl enable sssd
 sudo systemctl start sssd
 echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0022" | sudo tee -a /etc/pam.d/common-session
 # configure sudo
-echo "Please enter new user without @mydomain"
-read newuser
 echo "%domain\ admins@$DOMAIN ALL=(ALL) ALL" | sudo tee -a /etc/sudoers.d/domain_admins
-sudo echo "$newuser"'@'"$DOMAIN"" ALL=(ALL:ALL) ALL" >> /etc/sudoers
-while true; do
-   read -p 'Do you want to Reboot now? (y/n)?' yn
-   case $yn in
-    [Yy]* ) sudo reboot
-            break;;
-    [Nn]* ) echo "plese remember to reboot"
-            sleep 1
-            exit ;;
-    * ) echo 'Please answer yes or no.';;
-   esac
-done
+sudo echo "%""$hostname""sudoers ALL=(ALL:ALL) ALL" >> /etc/sudoers.d/sudoers
+exec sudo -u root /bin/sh - <<eof
+sed -i -e 's/fallback_homedir = \/home\/%u@%d/#fallback_homedir = \/home\/%u@%d/g' /etc/sssd/sssd.conf
+sed -i -e 's/use_fully_qualified_names = True/use_fully_qualified_names = False/g' /etc/sssd/sssd.conf
+echo "override_homedir = /home/%d/%u" >> /etc/sssd/sssd.conf
+eof
 }
 ############################### Update to Realmd from likewise ##################
 Realmdupdate(){