diff --git a/Jenkinsfile_numerics_mpi b/Jenkinsfile_numerics_mpi
index c32ec2c1f0d461b9d60fae86c4eb96273211480a..6084f8736459dbccd641703adcad180a567ebfc2 100644
--- a/Jenkinsfile_numerics_mpi
+++ b/Jenkinsfile_numerics_mpi
@@ -29,13 +29,16 @@ parallel (
 
                     stage ('run centos')
                     {
-		      parallel (
-                      "1" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1 0 0 numerics"},
-                      "2" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2 0 0 numerics"},
-                      "3" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 3 0 0 numerics"},
-                      "4" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 4 0 0 numerics"}
-                      )
+                      timeout(30)
+                      {
+		        parallel (
+                        "1" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1 0 0 numerics"},
+                        "2" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2 0 0 numerics"},
+                        "3" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 3 0 0 numerics"},
+                        "4" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 4 0 0 numerics"}
+                        )
                       sh "./success.sh 2 gin openfpm_numerics"
+                      }
                     }
                   }
                  },
@@ -70,9 +73,12 @@ parallel (
 
                     stage ('run mac')
                     {
-                      sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1 0 0 numerics"
-                      sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2 0 0 numerics"
-                      sh "./success.sh 2 sbalzarini-mac-15 openfpm_numerics"
+                      timeout(30)
+                      {
+                        sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1 0 0 numerics"
+                        sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2 0 0 numerics"
+                        sh "./success.sh 2 sbalzarini-mac-15 openfpm_numerics"
+                      }
                     }
                   }
                  },
@@ -104,13 +110,16 @@ parallel (
 
                     stage ('run ubuntu')
                     {
-		      parallel (
-                      "1" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1 0 0 numerics"},
-                      "2" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2 0 0 numerics"},
-                      "3" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 3 0 0 numerics"},
-                      "4" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 4 0 0 numerics"}
-                      )
-                      sh "./success.sh 2 gin openfpm_numerics"
+                      timeout(30)
+                      {
+		        parallel (
+                        "1" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1 0 0 numerics"},
+                        "2" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2 0 0 numerics"},
+                        "3" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 3 0 0 numerics"},
+                        "4" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 4 0 0 numerics"}
+                        )
+                        sh "./success.sh 2 gin openfpm_numerics"
+                      }
                     }
                   }
                  }
diff --git a/openfpm_io b/openfpm_io
index 764fcd4eb12ffa80acf469ce6e47bace55d7a9e2..b254bac46ffb61041747da255e49619b8b1f08b9 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit 764fcd4eb12ffa80acf469ce6e47bace55d7a9e2
+Subproject commit b254bac46ffb61041747da255e49619b8b1f08b9
diff --git a/openfpm_numerics b/openfpm_numerics
index bfb34d93c57beaafaac820f21fc922af5c78e387..7207e7c4e8d947a565fe0873573eee19c12c86c5 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit bfb34d93c57beaafaac820f21fc922af5c78e387
+Subproject commit 7207e7c4e8d947a565fe0873573eee19c12c86c5