diff --git a/Cargo.toml b/Cargo.toml
index 2785281f..e0b278d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -125,12 +125,8 @@ name = "hld_path_composite_yosupo"
 path = "examples/graphs/hld_path_composite_yosupo.rs"
 
 [[example]]
-name = "hld_jump_on_tree_nodes"
-path = "examples/graphs/hld_jump_on_tree_nodes.rs"
-
-[[example]]
-name = "hld_jump_on_tree_edges"
-path = "examples/graphs/hld_jump_on_tree_edges.rs"
+name = "hld_jump_on_path"
+path = "examples/graphs/hld_jump_on_path.rs"
 
 [[example]]
 name = "hopcroft_karp_yosupo"
diff --git a/examples/graphs/hld_jump_on_tree_edges.rs b/examples/graphs/hld_jump_on_path.rs
similarity index 89%
rename from examples/graphs/hld_jump_on_tree_edges.rs
rename to examples/graphs/hld_jump_on_path.rs
index 3d8e6fbf..97de62eb 100644
--- a/examples/graphs/hld_jump_on_tree_edges.rs
+++ b/examples/graphs/hld_jump_on_path.rs
@@ -28,6 +28,9 @@ fn main() {
             k: usize,
         }
 
+        assert_eq!(hld.kth_par(u, hld.d[u]), Some(0));
+        assert_eq!(hld.kth_par(u, hld.d[u] + 1), None);
+
         match hld.kth_on_path(u, v, k) {
             Some(w) => {
                 assert!(k <= hld.dist(u, v));
diff --git a/examples/graphs/hld_jump_on_tree_nodes.rs b/examples/graphs/hld_jump_on_tree_nodes.rs
deleted file mode 100644
index b1f770ed..00000000
--- a/examples/graphs/hld_jump_on_tree_nodes.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-// verification-helper: PROBLEM https://judge.yosupo.jp/problem/jump_on_tree
-
-use proconio::input;
-use programming_team_code_rust::graphs::hld::HLD;
-
-fn main() {
-    input! {
-        n: usize,
-        q: usize,
-    }
-
-    let mut adj = vec![vec![]; n];
-    for _ in 1..n {
-        input! {
-            u: usize,
-            v: usize
-        }
-        adj[u].push(v);
-        adj[v].push(u);
-    }
-
-    let hld = HLD::new(&mut adj, false);
-
-    fn dfs(u: usize, adj: &[Vec<usize>], d: &mut [usize]) {
-        for &v in &adj[u] {
-            d[v] = 1 + d[u];
-            dfs(v, adj, d);
-        }
-    }
-
-    let mut d = vec![0; n];
-    dfs(0, &adj, &mut d);
-
-    for _ in 0..q {
-        input! {
-            u: usize,
-            v: usize,
-            k: usize,
-        }
-
-        let in_sub_naive = hld.kth_par(v, d[u].abs_diff(d[v])) == Some(u);
-        assert_eq!(in_sub_naive, hld.in_sub(u, v));
-
-        match hld.kth_on_path(u, v, k) {
-            Some(w) => {
-                assert!(k < hld.dist(u, v));
-                assert!(hld.on_path(u, v, w));
-                if w != u {
-                    assert!(!hld.on_path(v, w, u));
-                }
-                println!("{}", w);
-            }
-            None => {
-                assert!(k >= hld.dist(u, v));
-                println!("-1");
-            }
-        }
-    }
-}
diff --git a/src/graphs/hld.rs b/src/graphs/hld.rs
index 076a60d8..c315a98a 100644
--- a/src/graphs/hld.rs
+++ b/src/graphs/hld.rs
@@ -33,6 +33,8 @@ pub struct HLD {
     pub p: Vec<Option<usize>>,
     /// time in
     pub tin: Vec<usize>,
+    /// depth
+    pub d: Vec<usize>,
     ord: Vec<usize>,
     siz: Vec<usize>,
     head: Vec<usize>,
@@ -66,16 +68,19 @@ impl HLD {
         }
         let mut tin = vec![0; n];
         let mut head = vec![0; n];
+        let mut d = vec![0; n];
         let ord = get_dfs_preorder(adj);
         for (i, &u) in ord.iter().enumerate() {
             tin[u] = i;
             for &v in &adj[u] {
+                d[v] = 1 + d[u];
                 head[v] = if v == adj[u][0] { head[u] } else { v };
             }
         }
         HLD {
             p,
             siz,
+            d,
             ord,
             tin,
             head,
@@ -92,7 +97,7 @@ impl HLD {
         let mut u_anc = false;
         loop {
             if self.tin[u] > self.tin[v] {
-                std::mem::swap(&mut u, &mut v);
+                (u, v) = (v, u);
                 u_anc = !u_anc;
             }
             if self.head[u] == self.head[v] {
@@ -124,7 +129,7 @@ impl HLD {
     pub fn lca(&self, mut u: usize, mut v: usize) -> usize {
         loop {
             if self.tin[u] > self.tin[v] {
-                std::mem::swap(&mut u, &mut v);
+                (u, v) = (v, u);
             }
             if self.head[u] == self.head[v] {
                 return u;
@@ -133,16 +138,13 @@ impl HLD {
         }
     }
 
-    /// If !vals_edges, then gets number of nodes on path from u to v
-    /// If vals_edges, then gets number of edges on path from u to v
+    /// Gets number of edges on path from u to v
     ///
     /// # Complexity
     /// - Time: O(log n)
     /// - Space: O(1)
     pub fn dist(&self, u: usize, v: usize) -> usize {
-        let mut dst = 0;
-        self.path(u, v, |range, _| dst += range.len());
-        dst
+        self.d[u] + self.d[v] - 2 * self.d[self.lca(u, v)]
     }
 
     /// Returns true iff v is in u's subtree
@@ -151,7 +153,7 @@ impl HLD {
     /// - Time: O(1)
     /// - Space: O(1)
     pub fn in_sub(&self, u: usize, v: usize) -> bool {
-        u == v || self.sub_tree(u).contains(&self.tin[v])
+        (self.tin[u]..self.tin[u] + self.siz[u]).contains(&self.tin[v])
     }
 
     /// Returns true iff w is on the path from u to v
@@ -188,14 +190,13 @@ impl HLD {
     /// - Time: O(log n)
     /// - Space: O(1)
     pub fn kth_on_path(&self, u: usize, v: usize, k: usize) -> Option<usize> {
-        let mut dst_side = [0; 2];
-        self.path(u, v, |range, u_anc| dst_side[u_anc as usize] += range.len());
-        if k < dst_side[1] {
-            return self.kth_par(u, k);
-        }
-        let dst = dst_side[0] + dst_side[1] - !self.vals_edges as usize;
-        if k <= dst {
-            self.kth_par(v, dst - k)
+        let lca_d = self.d[self.lca(u, v)];
+        let u_lca = self.d[u] - lca_d;
+        let v_lca = self.d[v] - lca_d;
+        if k <= u_lca {
+            self.kth_par(u, k)
+        } else if k <= u_lca + v_lca {
+            self.kth_par(v, u_lca + v_lca - k)
         } else {
             None
         }
diff --git a/src/graphs/lca.rs b/src/graphs/lca.rs
index 1305e17a..16adf1c3 100644
--- a/src/graphs/lca.rs
+++ b/src/graphs/lca.rs
@@ -84,7 +84,7 @@ impl LCA {
         }
         let (mut le, mut ri) = (self.tin[u], self.tin[v]);
         if le > ri {
-            std::mem::swap(&mut le, &mut ri);
+            (le, ri) = (ri, le);
         }
         self.p[self.rmq.query(le + 1..ri + 1).1].unwrap()
     }
diff --git a/src/strings/suf_ary.rs b/src/strings/suf_ary.rs
index 52f87a00..addb7c43 100644
--- a/src/strings/suf_ary.rs
+++ b/src/strings/suf_ary.rs
@@ -110,7 +110,7 @@ impl SufAry {
         }
         let (mut le, mut ri) = (self.sa_inv[i1], self.sa_inv[i2]);
         if le > ri {
-            std::mem::swap(&mut le, &mut ri);
+            (le, ri) = (ri, le);
         }
         self.rmq.query(le..ri)
     }