diff --git a/xdp-forward/xdp-forward.c b/xdp-forward/xdp-forward.c
index c9b5fe31..7d50c42d 100644
--- a/xdp-forward/xdp-forward.c
+++ b/xdp-forward/xdp-forward.c
@@ -2,6 +2,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
+#include <errno.h>
 
 #include <bpf/libbpf.h>
 #include <xdp/libxdp.h>
@@ -140,7 +142,10 @@ static int do_load(const void *cfg, __unused const char *pin_root_path)
 {
 	struct xdp_program *xdp_prog = NULL, *init_prog = NULL;
 	DECLARE_LIBBPF_OPTS(xdp_program_opts, opts);
+	struct bpf_program *return_prog = NULL;
 	const struct load_opts *opt = cfg;
+	struct bpf_link *link = NULL;
+	char pin_link_path[PATH_MAX];
 	struct xdp_forward *skel;
 	int ret = EXIT_FAILURE;
 	struct iface *iface;
@@ -217,6 +222,34 @@ static int do_load(const void *cfg, __unused const char *pin_root_path)
 		pr_info("Loaded on interface %s\n", iface->ifname);
 	}
 
+	/* Attach xdp_check_return to xdp_frame_return tracepoint and
+	 * pin the link to pin_root_path/xdp_check_return.
+	 */
+
+	return_prog = bpf_object__find_program_by_name(skel->obj,"xdp_check_return");
+	if (!return_prog) {
+		pr_warn("Failed to find xdp_check_return program\n");
+		goto end_detach;
+	}
+
+	link = bpf_program__attach_raw_tracepoint(return_prog, "xdp_frame_return");
+	if (libbpf_get_error((const void *) link)) {
+		pr_warn("Couldn't attach to xdp_frame_return: %s\n",
+			strerror(libbpf_get_error((const void *) link)));
+		goto end_detach;
+	}
+	skel->links.xdp_check_return = link;
+
+	snprintf(pin_link_path, sizeof(pin_link_path), "%s/%s", pin_root_path,
+			 "xdp_check_return");
+	ret = bpf_link__pin(link, pin_link_path);
+	if (ret) {
+		pr_warn("Failed to pin link: %s\n",
+			strerror(errno));
+		goto end_detach;
+	}
+	pr_info("Pinned xdp_check_return to %s\n", pin_link_path);
+
 end_destroy:
 	xdp_forward__destroy(skel);
 end:
@@ -225,6 +258,10 @@ static int do_load(const void *cfg, __unused const char *pin_root_path)
 end_detach:
 	for (iface = opt->ifaces; iface; iface = iface->next)
 		xdp_program__detach(xdp_prog, iface->ifindex, opt->xdp_mode, 0);
+	
+	bpf_link__unpin(link);
+	bpf_link__destroy(link);
+
 	goto end_destroy;
 }
 
@@ -246,6 +283,8 @@ struct prog_option unload_options[] = {
 static int do_unload(const void *cfg, __unused const char *pin_root_path)
 {
 	const struct unload_opts *opt = cfg;
+	struct bpf_link *link = NULL;
+	char pin_link_path[PATH_MAX];
 	int ret = EXIT_SUCCESS;
 	struct iface *iface;
 
@@ -258,6 +297,24 @@ static int do_unload(const void *cfg, __unused const char *pin_root_path)
 		pr_info("Unloaded from interface %s\n", iface->ifname);
 	}
 
+	snprintf(pin_link_path, sizeof(pin_link_path), "%s/%s", pin_root_path,
+			 "xdp_check_return");
+
+	link = bpf_link__open(pin_link_path);
+	ret = bpf_link__unpin(link);
+	if(ret){
+		pr_warn("Couldn't unpin link\n");
+	} else {
+		pr_info("Unpinned link from %s\n", pin_link_path);
+	}
+
+	ret = bpf_link__destroy(link);
+	if(ret){
+		pr_warn("Couldn't destroy link\n");
+	} else {
+		pr_info("Destroyed link\n");
+	}
+
 	return ret;
 }
 
diff --git a/xdp-forward/xdp_forward.bpf.c b/xdp-forward/xdp_forward.bpf.c
index 0adf2e1b..89cc6dcf 100644
--- a/xdp-forward/xdp_forward.bpf.c
+++ b/xdp-forward/xdp_forward.bpf.c
@@ -94,6 +94,7 @@ static int xdp_timer_cb(struct bpf_map *map, __u64 *key, struct bpf_timer *timer
 
 		bpf_printk("xdp_timer_cb: Sending to ifindex %d\n", tgt_ifindex);
 		xdp_packet_send(pkt, tgt_ifindex, 0);
+                state->outstanding_bytes += pkt->len;
 	}
 
 	xdp_packet_flush();