diff --git a/scripts/Makefile b/scripts/Makefile
index 9e65dc1..19882b3 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -896,38 +896,38 @@ jan_battle_light:
 jan_dcall_normal:
 	./run-3 \
 		32,jan_dcall_normal. \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-dup2-client 2 352, \
-		dcall-dup2-client 2 352, \
-		dcall-dup2-client 2 352, \
-		dcall-dup2-client 2 352, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176. \
-		dcall-simple-server 1 360, \
-		dcall-simple-server 1 360, \
-		dcall-simple-server 1 360, \
-		dcall-simple-server 1 360, \
-		dcall-dup2-server 2 352, \
-		dcall-dup2-server 2 352, \
-		dcall-dup2-server 2 352, \
-		dcall-dup2-server 2 352, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176. \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-dup2-client 2 387, \
+		dcall-dup2-client 2 387, \
+		dcall-dup2-client 2 387, \
+		dcall-dup2-client 2 387, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193. \
+		dcall-simple-server 1 396, \
+		dcall-simple-server 1 396, \
+		dcall-simple-server 1 396, \
+		dcall-simple-server 1 396, \
+		dcall-dup2-server 2 387, \
+		dcall-dup2-server 2 387, \
+		dcall-dup2-server 2 387, \
+		dcall-dup2-server 2 387, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 234, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 193. \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
@@ -964,38 +964,38 @@ jan_dcall_normal:
 jan_dcall_hardened:
 	./run-3 \
 		32,jan_dcall_hardened. \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-dup2-client 2 360, \
-		dcall-dup2-client 2 360, \
-		dcall-dup2-client 2 360, \
-		dcall-dup2-client 2 360, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311. \
-		dcall-simple-server 1 360, \
-		dcall-simple-server 1 360, \
-		dcall-simple-server 1 360, \
-		dcall-simple-server 1 360, \
-		dcall-dup2-server 2 360, \
-		dcall-dup2-server 2 360, \
-		dcall-dup2-server 2 360, \
-		dcall-dup2-server 2 360, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311. \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-dup2-client 2 396, \
+		dcall-dup2-client 2 396, \
+		dcall-dup2-client 2 396, \
+		dcall-dup2-client 2 396, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342. \
+		dcall-simple-server 1 396, \
+		dcall-simple-server 1 396, \
+		dcall-simple-server 1 396, \
+		dcall-simple-server 1 396, \
+		dcall-dup2-server 2 396, \
+		dcall-dup2-server 2 396, \
+		dcall-dup2-server 2 396, \
+		dcall-dup2-server 2 396, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 396, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 342. \
 		tor3 -f /etc/torrc_guard_2, \
 		tor3 -f /etc/torrc_guard_2, \
 		tor3 -f /etc/torrc_guard_2, \
@@ -1032,38 +1032,38 @@ jan_dcall_hardened:
 jan_dcall_light:
 	./run-3 \
 		32,jan_dcall_light. \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-simple-client 1 360, \
-		dcall-dup2-client 2 355, \
-		dcall-dup2-client 2 355, \
-		dcall-dup2-client 2 355, \
-		dcall-dup2-client 2 355, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153. \
-		dcall-simple-server-single 1 360, \
-		dcall-simple-server-single 1 360, \
-		dcall-simple-server-single 1 360, \
-		dcall-simple-server-single 1 360, \
-		dcall-dup2-server-single 2 355, \
-		dcall-dup2-server-single 2 355, \
-		dcall-dup2-server-single 2 355, \
-		dcall-dup2-server-single 2 355, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
-		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153. \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-simple-client 1 396, \
+		dcall-dup2-client 2 390, \
+		dcall-dup2-client 2 390, \
+		dcall-dup2-client 2 390, \
+		dcall-dup2-client 2 390, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168. \
+		dcall-simple-server-single 1 396, \
+		dcall-simple-server-single 1 396, \
+		dcall-simple-server-single 1 396, \
+		dcall-simple-server-single 1 396, \
+		dcall-dup2-server-single 2 390, \
+		dcall-dup2-server-single 2 390, \
+		dcall-dup2-server-single 2 390, \
+		dcall-dup2-server-single 2 390, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=1!measlat=0!window=2000 218, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168, \
+		dcall-lightning-server-single 12 fast_count=3!tick_tock=0!measlat=0!window=2000 168. \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
diff --git a/src/dcall.c b/src/dcall.c
index bda3e0b..640e0f7 100644
--- a/src/dcall.c
+++ b/src/dcall.c
@@ -41,7 +41,7 @@ int create_rx_chain(struct dcall_elements* de) {
   g_object_set(G_OBJECT (de->rx_jitterbuffer), "do-retransmission", FALSE, NULL);
   g_object_set(G_OBJECT (de->rx_jitterbuffer), "latency", de->latency, NULL);
   g_object_set(G_OBJECT (de->rx_jitterbuffer), "drop-on-latency", TRUE, NULL);
-  gst_util_set_object_arg(G_OBJECT(de->rx_jitterbuffer), "mode", "none");
+  gst_util_set_object_arg(G_OBJECT(de->rx_jitterbuffer), "mode", "buffer");
 
   g_object_set(G_OBJECT (de->rx_opusdec), "plc", TRUE, NULL);
   g_object_set(G_OBJECT (de->rx_opusdec), "use-inband-fec", FALSE, NULL);
@@ -271,7 +271,7 @@ int main(int argc, char *argv[]) {
          de.local_host, de.local_port, de.remote_host, de.remote_port, de.audio_tap, de.audio_sink, de.latency, de.audio_file);
 
   setenv("GST_DEBUG_FILE", de.gstreamer_log_path, 0);
-  setenv("GST_DEBUG", "3,opusdec:5", 0);
+  setenv("GST_DEBUG", "3,opusdec:5,rtpjitterbuffer:4", 0);
 
   gst_init (&argc, &argv);
   de.loop = g_main_loop_new (NULL, FALSE);