diff --git a/ws2012/P2P/uebungen/11/src/message/Ack.java b/ws2012/P2P/uebungen/11/src/message/Ack.java
index bfc914bb..f1426e68 100644
--- a/ws2012/P2P/uebungen/11/src/message/Ack.java
+++ b/ws2012/P2P/uebungen/11/src/message/Ack.java
@@ -109,10 +109,8 @@ public class Ack {
                                 Level.FINE,
                                 "Didn't receive RPC Ack {0} by now. Resending... ",
                                 new Object[] { rpcId });
-                        LOGGER.log(Level.INFO, receiver.getAddress().toString());
-                        if(!receiver.getAddress().toString().equals("/0.0.0.0:0")){
-                            //TODO
-                        channel.send(buffer, receiver.getAddress());}
+                        LOGGER.log(Level.INFO, receiver.getAddress().toString());                        
+                        channel.send(buffer, receiver.getAddress());
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
diff --git a/ws2012/P2P/uebungen/11/src/node/UDPHandler.java b/ws2012/P2P/uebungen/11/src/node/UDPHandler.java
index 93ebff8e..537d6e00 100644
--- a/ws2012/P2P/uebungen/11/src/node/UDPHandler.java
+++ b/ws2012/P2P/uebungen/11/src/node/UDPHandler.java
@@ -251,8 +251,7 @@ public class UDPHandler implements Runnable {
                 if(chunklist.get(fid).size() >= chunkCount){
                     LOGGER.log(Level.INFO,"FILE complete file: "+fileID+" count: "+chunkCount+" id: "+chunkID);
                     String file = "";
-                    for(int i=0; i<chunklist.get(fid).size();i++){
-                        //TODO Reihenfolge!!!
+                    for(int i=0; i<chunklist.get(fid).size();i++){                        
                         file += chunklist.get(fid).get(i);
                     }
                     node.store(fid);
@@ -260,10 +259,8 @@ public class UDPHandler implements Runnable {
                     chunklist.remove(fid);
                     LOGGER.log(Level.INFO,"FILE DATA: "+file);
                 }          
-
-		// This should be the answer to a prior FIND_NODE -> mark this RPC ID as
-		// received
-		node.receivedRPC(fromID, rpcID);
+		
+                node.sendAck(fromID, rpcID);
 
 		LOGGER.log(Level.INFO, "Received [DATA] [{0}] from Node {1})",
 				new Object[] { data.toString(), fromID });
@@ -273,8 +270,8 @@ public class UDPHandler implements Runnable {
         private void receiveDataReq(NodeIdentifier fromID, Identifier rpcID) {
             Identifier fid = getIDFromBuffer();
             //FileIdentifier fid = new FileIdentifier(1, buffer.array());
-            node.sendData(fromID, fid);            
-            node.receivedRPC(fromID, rpcID);
+            node.sendData(fromID, fid);                        
+            node.sendAck(fromID, rpcID);
         }
 
 	private void receivePong(NodeIdentifier fromID, Identifier rpcID) {