diff --git a/.travis.yml b/.travis.yml
index f7aeaa3..28d0f81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,6 @@ after_success:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
   - chmod +x send.sh
   - ./send.sh success $WEBHOOK_URL
-  - mvn clean compile assembly:single
-  - cd target
-  - sshpass -p $SFTP_PASSWORD scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r Hadder-Build.jar $SFTP_USER@$SFTP_IP:/home/Bots/Hadder-Build.jar
-  - echo $?
-  - sshpass -p $SFTP_PASSWORD ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $SFTP_IP /home/Bots/deploy.sh
-  - echo $?   
   
 after_failure:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
diff --git a/pom.xml b/pom.xml
index bb0869f..700563d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>LATEST</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -75,22 +75,17 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.8.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>2.22.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>3.0.2</version>
           <configuration>
             <finalName>Hadder-Build</finalName>
-            <archive>
-              <manifest>
-                <mainClass>com.bbn.hadder.Hadder</mainClass>
-              </manifest>
-            </archive>
           </configuration>
         </plugin>
         <plugin>
@@ -103,7 +98,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.8.2</version>
+          <version>3.7.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -128,21 +123,6 @@
                 <target>12</target>
             </configuration>
         </plugin>
-      <plugin>
-      <artifactId>maven-assembly-plugin</artifactId>
-      <configuration>
-        <finalName>Hadder-Build</finalName>
-        <archive>
-          <manifest>
-            <mainClass>com.bbn.hadder.Hadder</mainClass>
-          </manifest>
-        </archive>
-        <descriptorRefs>
-          <descriptorRef>jar-with-dependencies</descriptorRef>
-        </descriptorRefs>
-        <appendAssemblyId>false</appendAssemblyId>
-      </configuration>
-    </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 76a3397..1da65ee 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -47,7 +47,7 @@ public class Hadder {
         DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder();
 
         builder.setShardsTotal(1);
-        builder.setActivity(Activity.streaming("auf dem BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
+        builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
         builder.setToken(config.getString("Token"));
 
 
diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java
index abcb264..2ac0825 100644
--- a/src/main/java/com/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java
@@ -7,6 +7,7 @@ package com.bbn.hadder.listener;
 import com.bbn.hadder.Rethink;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
@@ -17,6 +18,12 @@ import java.time.Instant;
 public class GuildListener extends ListenerAdapter {
 
     public void onGuildJoin(GuildJoinEvent event) {
+        for (User user : event.getJDA().getUsers()) {
+            if (!user.getId().equals(event.getJDA().getSelfUser().getId())) {
+                Rethink.insertUser(user.getId());
+            }
+        }
+
         Rethink.insertServer(event.getGuild().getId());
         EmbedBuilder builder = new EmbedBuilder();
         event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder)