diff --git a/examples/correlation_matrices/sampler.cpp b/examples/correlation_matrices/sampler.cpp
index 9faaf9553..22a9b7f3a 100644
--- a/examples/correlation_matrices/sampler.cpp
+++ b/examples/correlation_matrices/sampler.cpp
@@ -16,8 +16,11 @@
 #include "cartesian_geom/cartesian_kernel.h"
 #include "convex_bodies/spectrahedra/spectrahedron.h"
 #include "random_walks/random_walks.hpp"
+#include "random_walks/uniform_accelerated_billiard_walk.hpp"
 #include "sampling/sample_correlation_matrices.hpp"
 #include "matrix_operations/EigenvaluesProblems.h"
+#include "diagnostics/effective_sample_size.hpp"
+#include "diagnostics/univariate_psrf.hpp"
 
 typedef double                                              NT;
 typedef Eigen::Matrix<NT, Eigen::Dynamic, Eigen::Dynamic>   MT;
@@ -147,6 +150,73 @@ void correlation_matrix_uniform_sampling_MT(const unsigned int n, const unsigned
     write_to_file<PointMT>(walkname + "_matrices_MT" + std::to_string(n) + ".txt", randPoints);
 }
 
+template<typename WalkTypePolicy, typename PointType, typename RNGType, typename MT>
+void tune_parameter_L(const int choice, const std::vector<unsigned int>& dimensions, const unsigned int num_points,
+            	      const unsigned int walkL=1, const unsigned int nburns=0){
+    using NT = typename MT::Scalar;
+    for (unsigned int n : dimensions) {
+        std::list<MT> randCorMatrices;
+   	int d = n*(n-1)/2;
+       	double _L;
+    	switch(choice){
+            case 1:  
+                _L = sqrt(NT(d));
+            	std::cout << "The value of L = sqrt(d) = " << _L << std::endl;
+            	break;
+            case 2:
+                _L = 2 * sqrt(NT(d));
+            	std::cout << "The value of L = 2 * sqrt(d) = " << _L << std::endl;
+            	break;
+            case 3:  
+            	_L = 4 * sqrt(NT(d));
+            	std::cout << "The value of L = 4 * sqrt(d) = " << _L << std::endl;
+            	break;
+            case 4:
+             	_L = NT(d) / 4.0;
+             	std::cout << "The value of L = d / 4.0 = " << _L << std::endl;
+            	break;
+            default:
+            	_L = NT(d) / 10.0;
+            	std::cout << "The value of L = d / 10.0 = " << _L << std::endl;
+            	break;
+        }
+    	std::cout<< "Testing L = " << _L << std::endl;
+    	WalkTypePolicy walk(_L);
+        
+	std::chrono::steady_clock::time_point start, end;
+        double time;
+        start = std::chrono::steady_clock::now();
+
+        uniform_correlation_sampling_MT<WalkTypePolicy, PointType, RNGType>(n, randCorMatrices, walkL, num_points, nburns);
+
+        end = std::chrono::steady_clock::now();
+        time = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+        std::cout << "Elapsed time : " << time << " (ms) for dimension: "<< n << std::endl;
+       	 
+        MT samples(d, num_points);
+        unsigned int jj = 0;
+        for(auto& mat : randCorMatrices){
+            samples.col(jj) = getCoefficientsFromMatrix<NT, MT>(mat);
+            jj++;
+        }       	 
+       	 
+        //calculate psrf
+        VT psrf = univariate_psrf<NT, VT, MT>(samples);
+        double max_psrf = psrf.maxCoeff(); 
+        std::cout << "PSRF = " << max_psrf << std::endl;
+   	 
+    	//calculate ess
+        unsigned int min_ess = 0;
+        VT ess_vector = effective_sample_size<NT, VT, MT>(samples, min_ess);
+        std::cout << "Effective Sample Size = " << min_ess << std::endl;
+        std::cout << "Average Effective Sample Size = " << min_ess/(double)num_points << std::endl;
+        std::cout << std::endl;
+
+        // Clear the matrices for the next iteration
+        randCorMatrices.clear();   	 
+    }
+}
+
 int main(int argc, char const *argv[]){
 
 // To enable Intel MKL, change option USE_MKL to ON in CMakeLists.txt
diff --git a/include/sampling/sample_correlation_matrices.hpp b/include/sampling/sample_correlation_matrices.hpp
index 50b7a45da..b2bd118b3 100644
--- a/include/sampling/sample_correlation_matrices.hpp
+++ b/include/sampling/sample_correlation_matrices.hpp
@@ -14,6 +14,21 @@
 
 #include <sampling/sampling.hpp>
 
+template<typename NT, typename MT>
+MT getCoefficientsFromMatrix(const MT& mat) {
+    int n = mat.rows();
+    int d = n * (n - 1) / 2;
+    Eigen::Matrix<NT, Eigen::Dynamic, 1> coeffs(d);
+    int k = 0;
+    for (int i = 0; i < n; ++i) {
+        for (int j = 0; j < i; ++j) {
+            coeffs(k) = mat(i, j);
+            ++k;
+    	}
+    }
+    return coeffs;
+}
+
 // New implementations for sampling correlation matrices with CorrelationSpectrahedron and CorrelationSpectrahedron_MT
 
 template
diff --git a/test/sampling_correlation_matrices_test.cpp b/test/sampling_correlation_matrices_test.cpp
index a17c36ce6..f14d89261 100644
--- a/test/sampling_correlation_matrices_test.cpp
+++ b/test/sampling_correlation_matrices_test.cpp
@@ -36,21 +36,6 @@ MT rebuildMatrix(const VT &xvector, const unsigned int n){
     return mat;
 }
 
-template<typename NT, typename MT>
-Eigen::Matrix<NT, Eigen::Dynamic, 1> getCoefficientsFromMatrix(const MT& mat) {
-	int n = mat.rows();
-	int d = n * (n - 1) / 2;
-	Eigen::Matrix<NT, Eigen::Dynamic, 1> coeffs(d);
-	int k = 0;
-	for (int i = 0; i < n; ++i) {
-    	for (int j = 0; j < i; ++j) {
-        	coeffs(k) = mat(i, j);
-        	++k;
-    	}
-	}
-	return coeffs;
-}
-
 template<typename NT, typename VT, typename MT, typename PointList>
 void check_output(PointList &randPoints, int num_points, int n){
     int d = n*(n-1)/2, count = 0;