diff --git a/ho_basis.jl b/ho_basis.jl
index c6c4928..b77939e 100644
--- a/ho_basis.jl
+++ b/ho_basis.jl
@@ -76,15 +76,15 @@ end
 get_H_matrix(V_l, ns, ls) = get_T_matrix(ns, ls) + get_V_matrix(V_l, ns, ls)
 
 function Moshinsky_transform(Es, n1s, l1s, n2s, l2s, Λ)
-    l_max = 2*max(maximum(l1s), maximum(l2s)) # OPTIMIZE
-    E_max = maximum(Es) # OPTIMIZE
-    j_max = l_max # OPTIMIZE
+    E_max = maximum(Es)
+    j_max = 2 * E_max + 1
+    l_max = j_max
     to = 0 # unused
     
-    dtri = NuclearToolkit.prep_dtri(l_max) ;     println("dtri prepared")
-    dcgm0 = NuclearToolkit.prep_dcgm0(l_max) ;     println("dcgm0 prepared")
-    d6j = NuclearToolkit.prep_d6j_int(E_max, j_max, to) ;     println("d6j prepared")
-
+    dtri = NuclearToolkit.prep_dtri(l_max + 1);
+    dcgm0 = NuclearToolkit.prep_dcgm0(l_max);
+    d6j = NuclearToolkit.prep_d6j_int(E_max, j_max, to);
+        
     mat = zeros(length(Es), length(Es))
     s = hcat(Es, n1s, l1s, n2s, l2s)
     for idx in CartesianIndices(mat)