diff --git a/common/ScaLBL.h b/common/ScaLBL.h
index be9e8af4..51462e29 100644
--- a/common/ScaLBL.h
+++ b/common/ScaLBL.h
@@ -22,6 +22,7 @@ extern "C" void ScaLBL_DeviceBarrier();
 extern "C" void ScaLBL_D3Q19_Pack(int q, int *list, int start, int count, double *sendbuf, double *dist, int N);
 
 extern "C" void ScaLBL_D3Q19_Unpack(int q, int *list, int start, int count, double *recvbuf, double *dist, int N);
+extern "C" void ScaLBL_D3Q7_Unpack(int q, int *list, int start, int count, double *recvbuf, double *dist, int N);
 
 extern "C" void ScaLBL_Scalar_Pack(int *list, int count, double *sendbuf, double *Data, int N);
 
@@ -1373,27 +1374,27 @@ void ScaLBL_Communicator::BiRecvD3Q7(double *A_even, double *A_odd, double *B_ev
 	//..................................................................................
 	*/
 	//...Map recieve list for the X face: q=2,8,10,12,13 ................................
-	ScaLBL_D3Q19_Unpack(0,dvcRecvDist_X,0,recvCount_X,recvbuf_X,A_odd,N);
-	ScaLBL_D3Q19_Unpack(0,dvcRecvDist_X,recvCount_X,recvCount_X,recvbuf_X,B_odd,N);
+	ScaLBL_D3Q7_Unpack(0,dvcRecvDist_X,0,recvCount_X,recvbuf_X,A_odd,N);
+	ScaLBL_D3Q7_Unpack(0,dvcRecvDist_X,recvCount_X,recvCount_X,recvbuf_X,B_odd,N);
 	//...................................................................................
 	//...Map recieve list for the x face: q=1,7,9,11,13..................................
-	ScaLBL_D3Q19_Unpack(1,dvcRecvDist_x,0,recvCount_x,recvbuf_x,A_even,N);
-	ScaLBL_D3Q19_Unpack(1,dvcRecvDist_x,recvCount_x,recvCount_x,recvbuf_x,B_even,N);
+	ScaLBL_D3Q7_Unpack(1,dvcRecvDist_x,0,recvCount_x,recvbuf_x,A_even,N);
+	ScaLBL_D3Q7_Unpack(1,dvcRecvDist_x,recvCount_x,recvCount_x,recvbuf_x,B_even,N);
 	//...................................................................................
 	//...Map recieve list for the y face: q=4,8,9,16,18 .................................
-	ScaLBL_D3Q19_Unpack(1,dvcRecvDist_Y,0,recvCount_Y,recvbuf_Y,A_odd,N);
-	ScaLBL_D3Q19_Unpack(1,dvcRecvDist_Y,recvCount_Y,recvCount_Y,recvbuf_Y,B_odd,N);
+	ScaLBL_D3Q7_Unpack(1,dvcRecvDist_Y,0,recvCount_Y,recvbuf_Y,A_odd,N);
+	ScaLBL_D3Q7_Unpack(1,dvcRecvDist_Y,recvCount_Y,recvCount_Y,recvbuf_Y,B_odd,N);
 	//...................................................................................
 	//...Map recieve list for the Y face: q=3,7,10,15,17 ................................
-	ScaLBL_D3Q19_Unpack(2,dvcRecvDist_y,0,recvCount_y,recvbuf_y,A_even,N);
-	ScaLBL_D3Q19_Unpack(2,dvcRecvDist_y,recvCount_y,recvCount_y,recvbuf_y,B_even,N);
+	ScaLBL_D3Q7_Unpack(2,dvcRecvDist_y,0,recvCount_y,recvbuf_y,A_even,N);
+	ScaLBL_D3Q7_Unpack(2,dvcRecvDist_y,recvCount_y,recvCount_y,recvbuf_y,B_even,N);
 	//...................................................................................
 	//...Map recieve list for the z face<<<6,12,13,16,17)................................
-	ScaLBL_D3Q19_Unpack(2,dvcRecvDist_Z,0,recvCount_Z,recvbuf_Z,A_odd,N);
-	ScaLBL_D3Q19_Unpack(2,dvcRecvDist_Z,recvCount_Z,recvCount_Z,recvbuf_Z,B_odd,N);
+	ScaLBL_D3Q7_Unpack(2,dvcRecvDist_Z,0,recvCount_Z,recvbuf_Z,A_odd,N);
+	ScaLBL_D3Q7_Unpack(2,dvcRecvDist_Z,recvCount_Z,recvCount_Z,recvbuf_Z,B_odd,N);
 	//...Map recieve list for the Z face<<<5,11,14,15,18)................................
-	ScaLBL_D3Q19_Unpack(3,dvcRecvDist_z,0,recvCount_z,recvbuf_z,A_even,N);
-	ScaLBL_D3Q19_Unpack(3,dvcRecvDist_z,recvCount_z,recvCount_z,recvbuf_z,B_even,N);
+	ScaLBL_D3Q7_Unpack(3,dvcRecvDist_z,0,recvCount_z,recvbuf_z,A_even,N);
+	ScaLBL_D3Q7_Unpack(3,dvcRecvDist_z,recvCount_z,recvCount_z,recvbuf_z,B_even,N);
 	//..................................................................................
 	Lock=false; // unlock the communicator after communications complete
 	//...................................................................................
diff --git a/cpu/D3Q7.cpp b/cpu/D3Q7.cpp
index 7acef4be..7dd004b9 100644
--- a/cpu/D3Q7.cpp
+++ b/cpu/D3Q7.cpp
@@ -1,5 +1,23 @@
 // CPU Functions for D3Q7 Lattice Boltzmann Methods
 
+extern "C" void ScaLBL_D3Q7_Unpack(int q, int *list,  int start, int count,
+					   double *recvbuf, double *dist, int N){
+	//....................................................................................
+	// Unack distribution from the recv buffer
+	// Distribution q matche Cqx, Cqy, Cqz
+	// swap rule means that the distributions in recvbuf are OPPOSITE of q
+	// dist may be even or odd distributions stored by stream layout
+	//....................................................................................
+	int n,idx;
+	for (idx=0; idx<count; idx++){
+		// Get the value from the list -- note that n is the index is from the send (non-local) process
+		n = list[idx];
+		// unpack the distribution to the proper location
+		if (!(n<0)) dist[q*N+n] = recvbuf[start+idx];
+		//dist[q*N+n] = recvbuf[start+idx];
+
+	}
+}
 extern "C" void ScaLBL_Scalar_Pack(int *list, int count, double *sendbuf, double *Data, int N){
 	//....................................................................................
 	// Pack distribution q into the send buffer for the listed lattice sites