diff --git a/src/de/mrbesen/youtubecrawler/Main.java b/src/de/mrbesen/youtubecrawler/Main.java
index 4967752..e2c1b8d 100644
--- a/src/de/mrbesen/youtubecrawler/Main.java
+++ b/src/de/mrbesen/youtubecrawler/Main.java
@@ -16,6 +16,7 @@ import de.mrbesen.telegram.event.EventHandler;
 import de.mrbesen.telegram.event.EventListener;
 import de.mrbesen.telegram.event.events.UserSendMessageEvent;
 import de.mrbesen.telegram.log.Log4JLog;
+import de.mrbesen.telegram.objects.TMessage;
 import de.mrbesen.telegram.objects.TUser;
 
 public class Main implements JSONCommandHandler, EventListener{
@@ -158,26 +159,13 @@ public class Main implements JSONCommandHandler, EventListener{
 	}
 
 	@Override
-	public boolean onCommand(TUser sender, String cmd, String[] args) {
-		//unused
-		return false;
-	}
-
-	@Override
-	public boolean onCommand(TUser sender, String cmd, String[] args, JSONObject j) {
+	public boolean onCommand(TUser sender, String cmd, String[] args, TMessage json) {
 		if(cmd.startsWith("random")) {
 			String ytid = cra.getDB().getRandom();
-			int chatid = 0;
-			try {
-				//log.debug(j.toString());
-				chatid = j.getJSONObject("chat").getInt("id");
-			} catch(Throwable t) { t.printStackTrace(); }
-			//log.info("chatid: " + chatid);
-			if(chatid != 0) {
-				tapi.sendMessage(new MessageBuilder().setText("https://youtube.com/watch?v=" + ytid).setReciver(chatid).build());
-			} else {
-				sender.sendMessage("https://youtube.com/watch?v=" + ytid);
-			}
+			int chatid = json.getChatID();
+
+			tapi.sendMessage(new MessageBuilder().setAsync().setText("https://youtube.com/watch?v=" + ytid).setReciver(chatid).build());
+
 			return true;
 		} else if(cmd.equals("admin")) {
 			if(admins.contains(sender.getName())) {
@@ -250,4 +238,6 @@ public class Main implements JSONCommandHandler, EventListener{
 			}
 		}
 	}
+
+
 }
\ No newline at end of file
diff --git a/src/de/mrbesen/youtubecrawler/Server.java b/src/de/mrbesen/youtubecrawler/Server.java
index dfcbcb1..71eb060 100644
--- a/src/de/mrbesen/youtubecrawler/Server.java
+++ b/src/de/mrbesen/youtubecrawler/Server.java
@@ -20,7 +20,7 @@ public class Server implements Runnable {
 	public Server(DB d) {
 		db = d;
 	}
-	
+
 	void start() {
 		run = true;
 		t = new Thread(this, "Server");
@@ -35,21 +35,21 @@ public class Server implements Runnable {
 	public void run() {
 		try {
 			final int port = 2419;
-			ssoc = new ServerSocket(port, -1, InetAddress.getByName("::1"));
+			ssoc = new ServerSocket(port, -1);
 			//ssoc.bind(new InetSocketAddress(, port));
 			ssoc.setSoTimeout(5);
 			log.info("opened Server at port " + port);
 			while(run) {
 				try {
 					Socket client = ssoc.accept();
-					if(client.getInetAddress().isLoopbackAddress()) {
-						PrintWriter out = new PrintWriter(client.getOutputStream());
-						out.println(db.getRandom());
-						out.flush();
-						out.close();
-					} else {
+					//if(client.getInetAddress().isLoopbackAddress()) {
+					PrintWriter out = new PrintWriter(client.getOutputStream());
+					out.println(db.getRandom());
+					out.flush();
+					out.close();
+					/*} else {
 						log.info("client connected: " + client.getInetAddress().toString());
-					}
+					}*/
 					client.close();
 				} catch(SocketTimeoutException ignored) {}
 			}