diff --git a/envi/binary.h b/envi/binary.h
index 1ee5718..433567d 100644
--- a/envi/binary.h
+++ b/envi/binary.h
@@ -79,55 +79,38 @@ public:
 		return test_file_size();
 	}
 
-	//DAVE: pass destination pointer as a parameter, make this a boolean function
-	T * saveZ(unsigned int page){
+	//save one band of the file into the memory, and return the pointer
+	bool saveZ( T * p, unsigned int page){
 
-		T * p;
-
-		if (page > R[2]){                       //make sure the bank number is right
+		if (page >= R[2]){										//make sure the bank number is right
 			std::cout<<"ERROR: page out of range"<<std::endl;
-			return NULL;
+			return false;
 		}
 
-		//DAVE: don't allocate memory here, do it in main()
-		p=(T *)malloc(R[0]*R[1]*sizeof(T));            //memory allocation
-		if (p==NULL)
-			cout<<"memory allocation failure";		
-
-		file.seekg(R[1] * R[0] * page * sizeof(T),ios::beg);   //write into memory from the binary file
+		file.seekg(R[1] * R[0] * page * sizeof(T), ios::beg);   //write into memory from the binary file
 		file.read((char *)p, R[0] * R[1] * sizeof(T));
 
-		return p;
+		return true;
 	}
 
-	//DAVE: same here
-	T * saveXY(unsigned x, unsigned y){
+	//save one pixel of the file into the memory, and return the pointer
+	bool saveXY(T * p, unsigned x, unsigned y){
 
-		T * px;
 		unsigned int i;
 
-		if (x<1||x>R[0]||y<1||y>R[1]){                       //make sure the sample and line number is right
-			cout<<"wrong page";
-			getchar();
-			return NULL;
+		if ( x >= R[0] || y >= R[1]){							//make sure the sample and line number is right
+			std::cout<<"ERROR: sample or line out of range"<<std::endl;
+			return false;
 		}
 
-		px=(T *)malloc(R[2]*sizeof(T));                      //memory allocation
-		if (px==NULL)
-			cout<<"memory allocation failure";	
-
-		x=x-1;
-		y=y-1;
-
-		file.seekg((x+y*R[0])*sizeof(T),ios::beg);           //point to the certain sample and line
-		for (i=0;i<R[2];i++)
+		file.seekg((x + y * R[0]) * sizeof(T), ios::beg);           //point to the certain sample and line
+		for (i = 0; i < R[2]; i++)
 		{
-			file.read((char *)(px+i), sizeof(T));
-			file.seekg((R[1]*R[0]-1)*sizeof(T),ios::cur);    //go to the next band
+			file.read((char *)(p + i), sizeof(T));
+			file.seekg((R[1] * R[0] - 1) * sizeof(T), ios::cur);    //go to the next band
 		}
 
-		return px;
-	
+		return true;	
 	}
 
 	/*bool open(std::string filename, unsigned int X, unsigned int h = 0){
--
libgit2 0.21.4