diff --git a/README.md b/README.md
index a2ea2a5..38b2371 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 # PiVideo
 
+## TO-DO
+- Add GPIO Shutdown and Start option to Script [see](https://raspberrypi.stackexchange.com/questions/117013/raspberry-pi-4-b-gpio-boot-and-shutdown-buttons)
+
 ## Overview
 
 This is a collection of scripts which run a video in a loop until a Button connected to GPIO is Pressed.
diff --git a/setup.sh b/setup.sh
index 76c37d7..6afb1a6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,10 +1,32 @@
 #! /bin/bash
 
+# Definition of colors for text output
 GREEN='\033[0;32m'
+CYAN_BACK='\x1b[46m'
+
 NOCOLOR='\033[0m'
 
 echo  -e "${GREEN}======== Starte Installation =========${NOCOLOR}"
 
+read  -p "Do you want to add a SystemD Service for Autostart [y|n]" INPUT
+SYSD=1
+
+case $INPUT in  
+  y|Y) SYSD=0 ;; 
+  n|N) SYSD=1 ;; 
+  *) echo "SystemD Service will not be Added...."  ;; 
+esac
+INPUT=""
+
+read  -p "Do you want to add GPIO Power Controle [y|n]" INPUT
+GPPower=1
+
+case $INPUT in  
+  y|Y) GPPower=0 ;; 
+  n|N) GPPower=1 ;; 
+  *) echo "GPIO Power controll will not be Addaded.........."  ;; 
+esac
+
 
 CURRENT_USER=$(whoami)
 SERVICE_NAME="pivideo.service"
@@ -49,6 +71,9 @@ ExecStart=
 ExecStart=-/sbin/agetty --autologin $CURRENT_USER --noclear tty1 linux
 "
 
+# Erstelle die Autologin-Service-Datei
+echo "Erstelle die Autologin-Service-Datei unter /etc/systemd/system/getty@tty1.service.d/override.conf..."
+sudo mkdir -p /etc/systemd/system/getty@tty1.service.d/
 
 SERVICE_CONTENT="[Unit]
 Description=Video Control Script
@@ -66,13 +91,9 @@ User=$CURRENT_USER
 WantedBy=multi-user.target
 "
 
-# Erstelle die Autologin-Service-Datei
-echo "Erstelle die Autologin-Service-Datei unter /etc/systemd/system/getty@tty1.service.d/override.conf..."
-sudo mkdir -p /etc/systemd/system/getty@tty1.service.d/
 
 echo "$AUTOLOGIN_SERVICE_CONTENT" | sudo tee /etc/systemd/system/getty@tty1.service.d/override.conf > /dev/null
 
-
 # Erstelle der PiVideo Service-Datei
 echo "$SERVICE_CONTENT" | sudo tee /etc/systemd/system/$SERVICE_NAME > /dev/null
 
@@ -80,21 +101,26 @@ echo "$SERVICE_CONTENT" | sudo tee /etc/systemd/system/$SERVICE_NAME > /dev/null
 echo  -e "${GREEN}======== Lade Dienste neu ========${NOCOLOR}"
 sudo systemctl daemon-reload
 
-# Aktiviere den Service, damit er beim Booten gestartet wird
-echo  -e "${GREEN}======== Aktiviern des Dienstes ========${NOCOLOR}"
-echo "Aktiviere den Autologin-Service..."
-sudo systemctl enable getty@tty1.service
+if [ $SYSD -eq 0 ]
+then
+    # Aktiviere den Service, damit er beim Booten gestartet wird
+    echo  -e "${GREEN}======== Aktiviern des Dienstes ========${NOCOLOR}"
 
-echo "Aktivire den PiVideo-Service..."
-sudo systemctl enable $SERVICE_NAME
-
-# Starten des Services
-echo  -e "${GREEN}======== Starente des Dienstes ========${NOCOLOR}"
-
-sudo systemctl start getty@tty1.service
-sudo systemctl start $SERVICE_NAME
+    echo "Aktivire den PiVideo-Service..."
+    sudo systemctl enable $SERVICE_NAME
 
+    # Starten des Services
+    echo  -e "${GREEN}======== Starente des Dienstes ========${NOCOLOR}"
+    sudo systemctl start $SERVICE_NAME
+else
+    echo -e "${CYAN_BACK} Automatic start of Playback disabled ${NOCOLOR}"
+    echo -e "${CYAN_BACK} Did not start Service, to start use \"sudo systemctl start pivideo.service\" ${NOCOLOR}"
+fi
 
+if [ $GPPower -eq 0 ]
+then
+  echo "dtoverlay=gpio-shutdown,gpio-pin=3" | sudo tee /boot/config.txt > /dev/null
+fi
 
 echo  -e "${GREEN}=========================================================${NOCOLOR}"
 echo  -e "${GREEN}======== Das Script wurde Erfolgreich Ausgeführt ========${NOCOLOR}"
diff --git a/videos/trigger.mp4 b/videos/trigger.mp4
index 9af497f..60d1abe 100644
Binary files a/videos/trigger.mp4 and b/videos/trigger.mp4 differ