diff --git a/dbremove b/dbremove
old mode 100644
new mode 100755
index aa2fd4a..2f88786
--- a/dbremove
+++ b/dbremove
@@ -1,15 +1,14 @@
 #!/bin/bash
+
 CONFIG=./setenv
 . $CONFIG
+. include/functions.DB
+
 USER=$1
+DATABASE=$1
 
-sudo mysqldump -u root $USER > /tmp/$USER.sql
-sudo mv /tmp/$USER.sql $BACKUP_USER_DATA/$USER.sql
-
-sudo mysql -u root << _EOF
-DROP DATABASE $USER;
-FLUSH PRIVILEGES;
-_EOF
+dump_database
+drop_database
 
 echo "The databases for $USER has been archived, and removed." | sudo mail -s "Database for $USER has been removed" $ADMIN_EMAIL
 
diff --git a/include/functions.DB b/include/functions.DB
index f146438..5c60485 100644
--- a/include/functions.DB
+++ b/include/functions.DB
@@ -9,3 +9,17 @@ GRANT ALL PRIVILEGES ON $DATABASE.* TO '$USER'@'localhost' IDENTIFIED BY '$PASSW
 FLUSH PRIVILEGES;
 _EOF
 }
+
+dump_database()
+{
+  sudo mysqldump -u root $DATABASE > /tmp/$DATABASE.sql
+  sudo mv /tmp/$DATABASE.sql /root/backups/$DATABASE.sql
+}
+
+drop_database()
+{
+sudo mysql -u root << _EOF
+DROP DATABASE $DATABASE;
+FLUSH PRIVILEGES;
+_EOF
+}