diff --git a/cuda_include b/cuda_include
new file mode 100644
index 0000000000000000000000000000000000000000..16981421116cb2ce7f9dcf3dba32df467827856c
--- /dev/null
+++ b/cuda_include
@@ -0,0 +1 @@
+-I
\ No newline at end of file
diff --git a/cuda_lib b/cuda_lib
new file mode 100644
index 0000000000000000000000000000000000000000..0519ecba6ea913e21689ec692e81e9e4973fbf73
--- /dev/null
+++ b/cuda_lib
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/dependencies_dir b/dependencies_dir
new file mode 100644
index 0000000000000000000000000000000000000000..f61d79660989549b7d0c195fbce72a3c1172205e
--- /dev/null
+++ b/dependencies_dir
@@ -0,0 +1 @@
+/Users/absingh/git/OpenFPM/Dependencies/
\ No newline at end of file
diff --git a/error_code b/error_code
new file mode 100644
index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547
--- /dev/null
+++ b/error_code
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/foward_options b/foward_options
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/mpi_include b/mpi_include
new file mode 100644
index 0000000000000000000000000000000000000000..16981421116cb2ce7f9dcf3dba32df467827856c
--- /dev/null
+++ b/mpi_include
@@ -0,0 +1 @@
+-I
\ No newline at end of file
diff --git a/mpi_libs b/mpi_libs
new file mode 100644
index 0000000000000000000000000000000000000000..0519ecba6ea913e21689ec692e81e9e4973fbf73
--- /dev/null
+++ b/mpi_libs
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/openfpm_numerics b/openfpm_numerics
index 2a8361592734205b286e792282784816ff989114..7e6db88d222f861221ecf7ebd7a7ad66cb73ee46 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit 2a8361592734205b286e792282784816ff989114
+Subproject commit 7e6db88d222f861221ecf7ebd7a7ad66cb73ee46
diff --git a/script/detect_gcc b/script/detect_gcc
index c9e712327e5cf093381daee802be66e56b989ac9..ba1d99129b110a796291a99a60c6c44537e35ef8 100755
--- a/script/detect_gcc
+++ b/script/detect_gcc
@@ -56,19 +56,31 @@ function detect_compiler()
     # First we try to understand if g++ command line is linked to clang
     if haveProg g++; then
 
+      is_apple_llvm=no
+      prefix_search=""
       g++ --version | grep "Apple LLVM" >/dev/null 2>&1
       if [ $? == 0 ]; then
+         is_apple_llvm=yes
+         prefix_search="LLVM"
+      fi
+      g++ --version | grep "Apple clang" >/dev/null 2>&1
+      if [ $? == 0 ]; then
+         is_apple_llvm=yes
+         prefix_search="clang"
+      fi
+
+      if [ x"$is_apple_llvm" == x"yes" ]; then
         echo "Apple LLVM based g++"
 
         # we try the detect the version
-        major=$(g++ --version | grep LLVM | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
+        major=$(g++ --version | grep $prefix_search | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
 
         # we check if the detection is garbage
         echo "$major" | egrep -q '^[0-9]+$'
         if [ $? == 0 ]; then
-           dgc_major=$(g++ --version | grep LLVM | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
-           dgc_middle=$(g++ --version | grep LLVM | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\2/g')
-           dgc_minor=$(g++ --version | grep LLVM | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\3/g')
+           dgc_major=$(g++ --version | grep $prefix_search | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
+           dgc_middle=$(g++ --version | grep $prefix_search | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\2/g')
+           dgc_minor=$(g++ --version | grep $prefix_search | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\3/g')
 
            if [ $dgc_major -gt 6 ]; then
              echo -e "clang++ $dgc_major.$dgc_middle.$dgc_minor \033[92;1m SUCCESS \033[0m"
@@ -235,5 +247,3 @@ function detect_compiler()
           echo "No compiler found"
     fi
 }
-
-
diff --git a/src/DCPSE/Dcpse.hpp b/src/DCPSE/Dcpse.hpp
index 9405d55e8f7f320deff5fc08000d3a0872b16f54..fffd11460132917ee5b1d0c30a78672affc9f0bd 100644
--- a/src/DCPSE/Dcpse.hpp
+++ b/src/DCPSE/Dcpse.hpp
@@ -1,12 +1,10 @@
 //
 // Created by tommaso on 29/03/19.
 //
-
 #ifndef OPENFPM_PDATA_DCPSE_HPP
 #define OPENFPM_PDATA_DCPSE_HPP
 
 #ifdef HAVE_EIGEN
-
 #include "Vector/vector_dist.hpp"
 #include "MonomialBasis.hpp"
 #include "../../openfpm_numerics/src/DMatrix/EMatrix.hpp"
@@ -270,7 +268,6 @@ void Dcpse<dim, T, list...>::initializeStaticSize(vector_dist<dim, T, aggregate<
         ++it;
     }
 }
-
-#endif // HAVE_EIGEN
-
+#endif
 #endif //OPENFPM_PDATA_DCPSE_HPP
+
diff --git a/src/Vector/tests/vector_dist_cell_list_tests.cpp b/src/Vector/tests/vector_dist_cell_list_tests.cpp
index 53c81c1144d50a0a5e79df8d1b3c241af6e2b2e5..e3d06af082a036f9777d21372f3a980fe649a659 100644
--- a/src/Vector/tests/vector_dist_cell_list_tests.cpp
+++ b/src/Vector/tests/vector_dist_cell_list_tests.cpp
@@ -1991,9 +1991,9 @@ void test_vector_dist_particle_NN_MP_iteration()
 	{
 		auto key = it.get();
 
-		vd.template getPosWrite(key)[0] = ud(eg);
-		vd.template getPosWrite(key)[1] = ud(eg);
-		vd.template getPosWrite(key)[2] = ud(eg);
+		vd.getPosWrite(key)[0] = ud(eg);
+		vd.getPosWrite(key)[1] = ud(eg);
+		vd.getPosWrite(key)[2] = ud(eg);
 
 		// Fill some properties randomly