diff --git a/CHIP-updater/install_extras.sh b/CHIP-updater/install_extras.sh
new file mode 100644
index 0000000..680671c
--- /dev/null
+++ b/CHIP-updater/install_extras.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Installing extras
+echo "."
+echo "*** installing extras. ***"
+
+apt install neofetch -y
+echo "neofetch" >> /home/chip/.bashrc
+
+wget https://raw.githubusercontent.com/asophila/headless/main/startup.sh
+chmod +x startup.sh
+
+sed -e -i '$i \sh /home/chip/startup.sh\n' /etc/rc.local
+
+echo -n "Insert a name for the ntfy.sh group where the network IP will be posted:"
+read group
+if [$group==""]; then
+    $group=="secret_ip"
+fi
+sed -i 's/SECRET_GROUP/$group/g' startup.sh
+
+echo -n "Insert a name for this host:"
+read hname
+
+hostnamectl set-hostname $hname
+
+
+echo "."
+echo "*** Done ***"
diff --git a/CHIP-updater/jessie-to-stretch.sh b/CHIP-updater/jessie-to-stretch.sh
index eea88ad..b7ebf8d 100644
--- a/CHIP-updater/jessie-to-stretch.sh
+++ b/CHIP-updater/jessie-to-stretch.sh
@@ -11,14 +11,14 @@ mv jessie_source_list.txt /etc/apt/sources.list
 
 echo "."
 echo "*** Installing debian keyring. ***"
-apt-get update
-apt-get install debian-keyring debian-archive-keyring -y --force-yes
+apt update
+apt install debian-keyring debian-archive-keyring -y
 sleep 5
 
 echo "."
 echo "*** apt update & upgrade ***"
-apt-get update
-apt-get upgrade -y
+apt update
+apt upgrade -y
 sleep 5
 
 # Upgrade from jessie to stretch 
@@ -30,8 +30,9 @@ mv stretch_source_list.txt /etc/apt/sources.list
 
 echo "."
 echo "*** apt update & upgrade ***"
-apt-get update
-apt-get full-upgrade
+apt update
+apt install linux-image-armmp -y 
+apt full-upgrade -y
 sleep 5
 
 # Define network variables
@@ -47,5 +48,7 @@ sudo mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak
 wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/stretch_x11.txt
 mv stretch_x11.txt /etc/X11/xorg.conf
 
+wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/stretch-to-buster.sh
+chmod +x stretch-to-buster.sh
 echo "."
 echo "*** Update to Stretch finished. Reboot to continue the process. ***"
\ No newline at end of file
diff --git a/CHIP-updater/stretch-to-buster.sh b/CHIP-updater/stretch-to-buster.sh
index 3a182a1..3b31fee 100644
--- a/CHIP-updater/stretch-to-buster.sh
+++ b/CHIP-updater/stretch-to-buster.sh
@@ -9,9 +9,9 @@ mv buster_source_list.txt /etc/apt/sources.list
 
 echo "."
 echo "*** apt update & upgrade ***"
-apt-get update
-apt-get install linux-image-armmp
-apt-get full-upgrade
+apt update
+apt install linux-image-armmp -y --force-yes
+apt full-upgrade -y --force-yes
 sleep 5
 
 
@@ -20,5 +20,6 @@ sudo mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak
 wget https://raw.githubusercontent.com/asophila/Flash-CHIP/master/CHIP-updater/buster_x11.txt
 mv buster_x11.txt /etc/X11/xorg.conf
 
+apt autoremove -y --force-yes
 echo "."
-echo "*** Update to Stretch finished. Reboot***"
+echo "*** Update to Buster finished. Reboot***"