diff --git a/benches/benchmark_portscan.rs b/benches/benchmark_portscan.rs
index c50c661d6..ef607e2fe 100644
--- a/benches/benchmark_portscan.rs
+++ b/benches/benchmark_portscan.rs
@@ -1,3 +1,4 @@
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use rustscan::input::{PortRange, ScanOrder};
 use rustscan::port_strategy::PortStrategy;
@@ -5,51 +6,74 @@ use rustscan::scanner::Scanner;
 use std::net::IpAddr;
 use std::time::Duration;
 
-fn portscan_tcp() {
+fn portscan_tcp(scanner: &Scanner) {
+    let _scan_result = block_on(scanner.run());
+}
+
+fn portscan_udp(scanner: &Scanner) {
+    let _scan_result = block_on(scanner.run());
+}
+
+fn bench_address() {
+    let _addrs = vec!["127.0.0.1".parse::<IpAddr>().unwrap()];
+}
+
+fn bench_port_strategy() {
+    let range = PortRange {
+        start: 1,
+        end: 1_000,
+    };
+    let _strategy = PortStrategy::pick(&Some(range.clone()), None, ScanOrder::Serial);
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
     let addrs = vec!["127.0.0.1".parse::<IpAddr>().unwrap()];
     let range = PortRange {
         start: 1,
-        end: 60_000,
+        end: 1_000,
     };
-    let strategy = PortStrategy::pick(&Some(range), None, ScanOrder::Serial);
-    let _scanner = Scanner::new(
+    let strategy_tcp = PortStrategy::pick(&Some(range.clone()), None, ScanOrder::Serial);
+    let strategy_udp = PortStrategy::pick(&Some(range.clone()), None, ScanOrder::Serial);
+
+    let scanner_tcp = Scanner::new(
         &addrs,
         10,
-        Duration::from_millis(100),
+        Duration::from_millis(10),
         1,
         false,
-        strategy,
+        strategy_tcp,
         true,
         vec![],
         false,
     );
-    // Perform the actual scan or logic here if needed
-}
 
-fn portscan_udp() {
-    let addrs = vec!["127.0.0.1".parse::<IpAddr>().unwrap()];
-    let range = PortRange {
-        start: 1,
-        end: 60_000,
-    };
-    let strategy = PortStrategy::pick(&Some(range), None, ScanOrder::Serial);
-    let _scanner = Scanner::new(
+    c.bench_function("portscan tcp", |b| {
+        b.iter(|| portscan_tcp(black_box(&scanner_tcp)))
+    });
+
+    let scanner_udp = Scanner::new(
         &addrs,
         10,
-        Duration::from_millis(100),
+        Duration::from_millis(10),
         1,
         false,
-        strategy,
+        strategy_udp,
         true,
         vec![],
         true,
     );
-    // Perform the actual scan or logic here if needed
-}
 
-fn criterion_benchmark(c: &mut Criterion) {
-    c.bench_function("portscan tcp", |b| b.iter(|| portscan_tcp()));
-    c.bench_function("portscan udp", |b| b.iter(|| portscan_udp()));
+    let mut udp_group = c.benchmark_group("portscan udp");
+    udp_group.measurement_time(Duration::from_secs(20));
+    udp_group.bench_function("portscan udp", |b| {
+        b.iter(|| portscan_udp(black_box(&scanner_udp)))
+    });
+    udp_group.finish();
+
+    // Benching helper functions
+    c.bench_function("parse address", |b| b.iter(|| bench_address()));
+
+    c.bench_function("port strategy", |b| b.iter(|| bench_port_strategy()));
 }
 
 criterion_group!(benches, criterion_benchmark);