diff --git a/internal/app/wwctl/node/powercycle/power.go b/internal/app/wwctl/node/powercycle/power.go
index 54e6084b..f7298a55 100644
--- a/internal/app/wwctl/node/powercycle/power.go
+++ b/internal/app/wwctl/node/powercycle/power.go
@@ -1,13 +1,14 @@
 package powercycle
 
 import (
+	"fmt"
+	"os"
+
+	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/hpcng/warewulf/internal/pkg/node"
 	"github.com/hpcng/warewulf/internal/pkg/power"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/spf13/cobra"
-	"os"
-	"fmt"
 )
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
@@ -32,7 +33,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		os.Exit(255)
 	}
 
-	batchpool := batch.New(50, 0)
+	batchpool := batch.New(50)
 	jobcount := len(nodeList)
 	results := make(chan power.IPMI, jobcount)
 
@@ -78,4 +79,3 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	return returnErr
 }
-
diff --git a/internal/app/wwctl/node/poweroff/power.go b/internal/app/wwctl/node/poweroff/power.go
index 62c6b2f5..29987ffa 100644
--- a/internal/app/wwctl/node/poweroff/power.go
+++ b/internal/app/wwctl/node/poweroff/power.go
@@ -1,13 +1,14 @@
 package poweroff
 
 import (
+	"fmt"
+	"os"
+
+	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/hpcng/warewulf/internal/pkg/node"
 	"github.com/hpcng/warewulf/internal/pkg/power"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/spf13/cobra"
-	"os"
-	"fmt"
 )
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
@@ -32,7 +33,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		os.Exit(255)
 	}
 
-	batchpool := batch.New(50, 0)
+	batchpool := batch.New(50)
 	jobcount := len(nodeList)
 	results := make(chan power.IPMI, jobcount)
 
@@ -78,4 +79,3 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	return returnErr
 }
-
diff --git a/internal/app/wwctl/node/poweron/power.go b/internal/app/wwctl/node/poweron/power.go
index da17a07a..020bf1ed 100644
--- a/internal/app/wwctl/node/poweron/power.go
+++ b/internal/app/wwctl/node/poweron/power.go
@@ -1,13 +1,14 @@
 package poweron
 
 import (
+	"fmt"
+	"os"
+
+	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/hpcng/warewulf/internal/pkg/node"
 	"github.com/hpcng/warewulf/internal/pkg/power"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/spf13/cobra"
-	"os"
-	"fmt"
 )
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
@@ -34,7 +35,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		wwlog.Printf(wwlog.VERBOSE, "Found %d matching nodes for power command\n", len(nodeList))
 	}
 
-	batchpool := batch.New(50, 0)
+	batchpool := batch.New(50)
 	jobcount := len(nodeList)
 	results := make(chan power.IPMI, jobcount)
 
@@ -80,4 +81,3 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	return returnErr
 }
-
diff --git a/internal/app/wwctl/node/powerstatus/power.go b/internal/app/wwctl/node/powerstatus/power.go
index 3449252e..5ec31622 100644
--- a/internal/app/wwctl/node/powerstatus/power.go
+++ b/internal/app/wwctl/node/powerstatus/power.go
@@ -1,13 +1,14 @@
 package powerstatus
 
 import (
+	"fmt"
+	"os"
+
+	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/hpcng/warewulf/internal/pkg/node"
 	"github.com/hpcng/warewulf/internal/pkg/power"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/spf13/cobra"
-	"os"
-	"fmt"
 )
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
@@ -34,7 +35,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		wwlog.Printf(wwlog.VERBOSE, "Found %d matching nodes for power command\n", len(nodeList))
 	}
 
-	batchpool := batch.New(50, 0)
+	batchpool := batch.New(50)
 	jobcount := len(nodeList)
 	results := make(chan power.IPMI, jobcount)
 
@@ -80,4 +81,3 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	return returnErr
 }
-
diff --git a/internal/app/wwctl/node/sensors/power.go b/internal/app/wwctl/node/sensors/power.go
index 2d8095b8..af2d54e2 100644
--- a/internal/app/wwctl/node/sensors/power.go
+++ b/internal/app/wwctl/node/sensors/power.go
@@ -1,13 +1,14 @@
 package sensors
 
 import (
+	"fmt"
+	"os"
+
+	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/hpcng/warewulf/internal/pkg/node"
 	"github.com/hpcng/warewulf/internal/pkg/power"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"github.com/spf13/cobra"
-	"os"
-	"fmt"
 )
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
@@ -32,7 +33,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		os.Exit(255)
 	}
 
-	batchpool := batch.New(50, 0)
+	batchpool := batch.New(50)
 	jobcount := len(nodeList)
 	results := make(chan power.IPMI, jobcount)
 
@@ -84,4 +85,3 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	return returnErr
 }
-
diff --git a/internal/pkg/batch/batch.go b/internal/pkg/batch/batch.go
index c2179cea..1473828d 100644
--- a/internal/pkg/batch/batch.go
+++ b/internal/pkg/batch/batch.go
@@ -1,22 +1,17 @@
-
 package batch
 
 import (
-	"time"
 	"sync"
 )
 
 type BatchPool struct {
 	active int
-	mintime	int
-	jobcount int
-	jobs []func()
+	jobs   []func()
 }
 
-func New(active int, mintime int) *BatchPool {
+func New(active int) *BatchPool {
 	pool := &BatchPool{
 		active: active,
-		mintime: mintime,
 	}
 	pool.jobs = []func(){}
 	return pool
@@ -30,28 +25,24 @@ func Min(x, y int) int {
 }
 
 func (pool *BatchPool) Submit(f func()) {
-	pool.jobcount++
 	pool.jobs = append(pool.jobs, f)
 }
 
-func wrapper(wg *sync.WaitGroup, f func()) {
-	defer wg.Done()
+func wrapper(wg *sync.WaitGroup, limiter chan struct{}, f func()) {
 	f()
+	<-limiter
+	wg.Done()
 }
 
 func (pool *BatchPool) Run() {
 	var wg sync.WaitGroup
-	count := pool.jobcount
-	for count > 0 {
-		for i:=0; i<Min(count, pool.active); i++ {
-			wg.Add(1)
-			go wrapper(&wg, pool.jobs[pool.jobcount-count])
-			count--
-		}
-		if (pool.mintime > 0) {
-			time.Sleep(time.Second * time.Duration(pool.mintime))
-		}
-		wg.Wait()
+	limiter := make(chan struct{}, pool.active)
+	for i := range pool.jobs {
+		limiter <- struct{}{}
+		wg.Add(1)
+		go wrapper(&wg, limiter, pool.jobs[i])
 	}
-}
 
+	wg.Wait()
+	close(limiter)
+}
diff --git a/test/batch-test.go b/test/batch-test.go
index a0d93672..33c9cb7f 100644
--- a/test/batch-test.go
+++ b/test/batch-test.go
@@ -1,37 +1,35 @@
-
 package main
 
 import (
-	"github.com/hpcng/warewulf/internal/pkg/batch"
 	"fmt"
-	"time"
 	"runtime"
+	"time"
+
+	"github.com/hpcng/warewulf/internal/pkg/batch"
 )
 
 func exampleJob(name string, id int) string {
 	fmt.Printf("[%d] %s started...\n", id, name)
-	time.Sleep(time.Second * 5)
+	time.Sleep(time.Second * time.Duration(id))
 	fmt.Printf("[%d] %s ending...\n", id, name)
 	return name
 }
 
-
 func main() {
 
 	fmt.Printf("GOMAXPROCS=%d\n", runtime.GOMAXPROCS(0))
 
-	jobstorun := 1000
+	jobstorun := 100
 
 	// create batch pool to run 100 jobs at a time every 10 seconds
-	batchpool := batch.New(100, 10)
+	batchpool := batch.New(10)
 	retvalues := make(chan string, jobstorun)
 
 	// submit a bunch of jobs
-	for i:=0; i<jobstorun; i++ {
+	for i := 0; i < jobstorun; i++ {
 
 		name := fmt.Sprintf("job-%04d", i)
-		id := i;
-
+		id := i
 		batchpool.Submit(func() {
 			retvalues <- exampleJob(name, id)
 		})
@@ -43,9 +41,8 @@ func main() {
 
 	close(retvalues)
 
-	for s:= range retvalues {
+	for s := range retvalues {
 		fmt.Printf("Return value is %s\n", s)
 	}
 
 }
-