diff --git a/dump.go b/dump.go
index 7bdd6be..f193238 100644
--- a/dump.go
+++ b/dump.go
@@ -32,7 +32,7 @@ func dumpCluster(w http.ResponseWriter) {
 func dumpDroplets(w http.ResponseWriter, full bool) {
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 
 		// this line in golang could replace 80 lines of COBOL
 		header := d.SprintDumpHeader() + " "
diff --git a/main.go b/main.go
index 55173f2..e40c6e8 100644
--- a/main.go
+++ b/main.go
@@ -65,7 +65,7 @@ func main() {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		if d == nil {
 			fmt.Println("d == nil")
 			os.Exit(-1)
diff --git a/poll.go b/poll.go
index fa2c317..8c238ef 100644
--- a/poll.go
+++ b/poll.go
@@ -164,7 +164,7 @@ func uptimeCheck() (bool, string) {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		total += 1
 		if d.StartState != pb.DropletState_ON {
 			continue
diff --git a/validate.go b/validate.go
index 6ea8aba..8f0f948 100644
--- a/validate.go
+++ b/validate.go
@@ -30,7 +30,7 @@ import (
 func ValidateUniqueMac(mac string) bool {
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		for _, n := range d.Networks {
 			if n.Mac == mac {
 				log.Info("duplicate MAC", n.Mac, "in droplet", d.Hostname)
@@ -68,7 +68,7 @@ func lookupFilename(filename string) *pb.Droplet {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		for _, disk := range d.Disks {
 			if filebase == disk.Filename {
 				return d
@@ -85,7 +85,7 @@ func ValidateUniqueFilenames() bool {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		for _, disk := range d.Disks {
 			filename := disk.Filename
 			addClusterFilepath(disk.Filepath)
@@ -115,7 +115,7 @@ func ValidateDiskFilenames() ([]*pb.Event, error) {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		var found bool = false
 		for _, disk := range d.Disks {
 			filename := disk.Filename
@@ -170,7 +170,7 @@ func getNewMac() string {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		for _, n := range d.Networks {
 			// log.Println("network:", n.Mac, d.Uuid, d.Hostname)
 			if _, ok := macs[n.Mac]; ok {
@@ -213,7 +213,7 @@ func ValidateDroplets() (map[string]string, map[string]string, error) {
 
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		// Generate a new UUID
 		if d.Uuid == "" {
 			u := uuid.New()
@@ -283,7 +283,7 @@ func ValidateDroplet(check *pb.Droplet) error {
 	// check for duplicate uuid's
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		if check == d {
 			continue
 		}
@@ -313,7 +313,7 @@ func ValidateDroplet(check *pb.Droplet) error {
 		}
 		loop := me.cluster.DropletsAll() // get the list of droplets
 		for loop.Scan() {
-			d := loop.Droplet()
+			d := loop.Next()
 			if check == d {
 				continue
 			}
@@ -342,7 +342,7 @@ func setUniqueSpicePort(check *pb.Droplet) error {
 	//	checkn.SpicePort = getUniqueSpicePort()
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
-		d := loop.Droplet()
+		d := loop.Next()
 		if d.SpicePort == 0 {
 			continue
 		}