diff --git a/conf/base.config b/conf/base.config
index 9f4abdba..ad3cafc0 100755
--- a/conf/base.config
+++ b/conf/base.config
@@ -132,12 +132,11 @@ process {
         time   = { check_max( 10.h     * task.attempt, 'time'    ) }
     }
 
-    // Standard parameters, covers most insecta
+    // Standard parameters, covers most insecta. However the memory should be approx 10 * genome size
     withName: '.*:.*:READ_COVERAGE:MINIMAP2_ALIGN' {
         cpus    = { check_max( 20       * 1, 'cpus'                 ) }
         memory  = { check_max( 50.GB    * task.attempt, 'memory'    ) }
         time    = { check_max( 1.h      * (reference.size() < 1e9 ? 10 : reference.size() < 2.5e9 ? 30 : 300), 'time'      ) }
-        //time   = { check_max( 30.h    * task.attempt, 'time'    ) }
     }
 
     withName: '.*:.*:READ_COVERAGE:SAMTOOLS_SORT' {
@@ -284,7 +283,7 @@ process {
     //
     withName: '.*:.*:SYNTENY:MINIMAP2_ALIGN' {
         cpus    = { check_max( 20       * 1, 'cpus'                 ) }
-        memory  = { check_max( 1.1.GB    * Math.ceil( (reference.size() / 1e+9) * 30 )    * task.attempt, 'memory'    ) }
+        memory  = { check_max( 1.1.GB   * Math.ceil( (reference.size() / 1e+9) * 30 )    * task.attempt, 'memory'    ) }
         time    = { check_max( 20.h     * task.attempt, 'time'      ) }
     }
 
@@ -292,9 +291,15 @@ process {
     // SUBWORKFLOW: REPEAT_DENSITY
     //
 
-    withName: '(WINDOWMASKER_MKCOUNTS|WINDOWMASKER_USTAT)' {
+    withName: WINDOWMASKER_MKCOUNTS {
+        cpus   = { check_max( 6                         , 'cpus'    ) }
+        memory = { check_max( 1.5.GB    * Math.ceil( ref.size() / 1e+9 )    * task.attempt, 'memory'    ) }
+        time   = { check_max( 10.h      * task.attempt  , 'time'    ) }
+    }
+
+    withName: WINDOWMASKER_USTAT {
         cpus   = { check_max( 1                         , 'cpus'    ) }
-        memory = { check_max( 5.GB      * task.attempt  , 'memory'  ) }
+        memory = { check_max( 1.GB    * Math.ceil( ref.size() / 2e+9 )    * task.attempt, 'memory'    ) }
         time   = { check_max( 4.h       * task.attempt  , 'time'    ) }
     }
 }