diff --git a/cpu/D3Q19.cpp b/cpu/D3Q19.cpp
index 5bfe305f..2c0e686d 100644
--- a/cpu/D3Q19.cpp
+++ b/cpu/D3Q19.cpp
@@ -1197,35 +1197,11 @@ extern "C" void ScaLBL_D3Q19_AAeven_MRT(double *dist, int start, int finish, int
 
 		//..............incorporate external force................................................
 		//..............carry out relaxation process...............................................
-//		m1 = m1 + rlx_setA*((19*(jx*jx+jy*jy+jz*jz)/rho - 11*rho) - m1);
-//		m2 = m2 + rlx_setA*((3*rho - 5.5*(jx*jx+jy*jy+jz*jz)/rho) - m2);
-//		m4 = m4 + rlx_setB*((-0.6666666666666666*jx) - m4);
-//		m6 = m6 + rlx_setB*((-0.6666666666666666*jy) - m6);
-//		m8 = m8 + rlx_setB*((-0.6666666666666666*jz) - m8);
-//		m9 = m9 + rlx_setA*(((2*jx*jx-jy*jy-jz*jz)/rho) - m9);
-//		m10 = m10 + rlx_setA*(-0.5*((2*jx*jx-jy*jy-jz*jz)/rho) - m10);
-//		m11 = m11 + rlx_setA*(((jy*jy-jz*jz)/rho) - m11);
-//		m12 = m12 + rlx_setA*(-0.5*((jy*jy-jz*jz)/rho) - m12);
-//		m13 = m13 + rlx_setA*((jx*jy/rho) - m13);
-//		m14 = m14 + rlx_setA*((jy*jz/rho) - m14);
-//		m15 = m15 + rlx_setA*((jx*jz/rho) - m15);
-//		m16 = m16 + rlx_setB*( - m16);
-//		m17 = m17 + rlx_setB*( - m17);
-//		m18 = m18 + rlx_setB*( - m18);
-
-		m1 = m1 + rlx_setA*((19*(jx*jx+jy*jy+jz*jz)/rho - 11*rho) - m1)
-                + (1-0.5*rlx_setA)*38*(Fx*jx+Fy*jy+Fz*jz)/rho;
-		m2 = m2 + rlx_setA*((3*rho - 5.5*(jx*jx+jy*jy+jz*jz)/rho) - m2)
-                + (1-0.5*rlx_setA)*11*(-Fx*jx-Fy*jy-Fz*jz)/rho;
-        jx = jx + Fx;
-		m4 = m4 + rlx_setB*((-0.6666666666666666*jx) - m4)
-                + (1-0.5*rlx_setB)*(-0.6666666666666666*Fx);
-        jy = jy + Fy;
-		m6 = m6 + rlx_setB*((-0.6666666666666666*jy) - m6)
-                + (1-0.5*rlx_setB)*(-0.6666666666666666*Fy);
-        jz = jz + Fz;
-		m8 = m8 + rlx_setB*((-0.6666666666666666*jz) - m8)
-                + (1-0.5*rlx_setB)*(-0.6666666666666666*Fz);
+		m1 = m1 + rlx_setA*((19*(jx*jx+jy*jy+jz*jz)/rho - 11*rho) - m1);
+		m2 = m2 + rlx_setA*((3*rho - 5.5*(jx*jx+jy*jy+jz*jz)/rho) - m2);
+		m4 = m4 + rlx_setB*((-0.6666666666666666*jx) - m4);
+		m6 = m6 + rlx_setB*((-0.6666666666666666*jy) - m6);
+		m8 = m8 + rlx_setB*((-0.6666666666666666*jz) - m8);
 		m9 = m9 + rlx_setA*(((2*jx*jx-jy*jy-jz*jz)/rho) - m9);
 		m10 = m10 + rlx_setA*(-0.5*((2*jx*jx-jy*jy-jz*jz)/rho) - m10);
 		m11 = m11 + rlx_setA*(((jy*jy-jz*jz)/rho) - m11);
@@ -1236,7 +1212,6 @@ extern "C" void ScaLBL_D3Q19_AAeven_MRT(double *dist, int start, int finish, int
 		m16 = m16 + rlx_setB*( - m16);
 		m17 = m17 + rlx_setB*( - m17);
 		m18 = m18 + rlx_setB*( - m18);
-
 		//.......................................................................................................
 		//.................inverse transformation......................................................
 
@@ -1245,149 +1220,105 @@ extern "C" void ScaLBL_D3Q19_AAeven_MRT(double *dist, int start, int finish, int
 		dist[n] = fq;
 
 		// q = 1
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jx-m4)+mrt_V6*(m9-m10) + 0.16666666*Fx;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jx-m4)+mrt_V6*(m9-m10);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jx-m4)+mrt_V6*(m9-m10) + 0.16666666*Fx;
 		dist[1*Np+n] = fq;
 
 		// q=2
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m4-jx)+mrt_V6*(m9-m10) -  0.16666666*Fx;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m4-jx)+mrt_V6*(m9-m10);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m4-jx)+mrt_V6*(m9-m10) -  0.16666666*Fx;
 		dist[2*Np+n] = fq;
 
 		// q = 3
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jy-m6)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) + 0.16666666*Fy;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jy-m6)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jy-m6)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) + 0.16666666*Fy;
 		dist[3*Np+n] = fq;
 
 		// q = 4
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m6-jy)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) - 0.16666666*Fy;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m6-jy)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m6-jy)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) - 0.16666666*Fy;
 		dist[4*Np+n] = fq;
 
 		// q = 5
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jz-m8)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) + 0.16666666*Fz;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jz-m8)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jz-m8)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) + 0.16666666*Fz;
 		dist[5*Np+n] = fq;
 
 		// q = 6
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m8-jz)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) - 0.16666666*Fz;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m8-jz)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m8-jz)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) - 0.16666666*Fz;
 		dist[6*Np+n] = fq;
 
 		// q = 7
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx+jy)+0.025*(m4+m6)
-//                                                								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//                                                								+mrt_V12*m12+0.25*m13+0.125*(m16-m17) + 0.08333333333*(Fx+Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx+jy)+0.025*(m4+m6)
                                                 								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-                                                								+mrt_V12*m12+0.25*m13+0.125*(m16-m17);
+                                                								+mrt_V12*m12+0.25*m13+0.125*(m16-m17) + 0.08333333333*(Fx+Fy);
 		dist[7*Np+n] = fq;
 
 
 		// q = 8
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jy)-0.025*(m4+m6) +mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//				+mrt_V12*m12+0.25*m13+0.125*(m17-m16) - 0.08333333333*(Fx+Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jy)-0.025*(m4+m6) +mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-				+mrt_V12*m12+0.25*m13+0.125*(m17-m16);
+				+mrt_V12*m12+0.25*m13+0.125*(m17-m16) - 0.08333333333*(Fx+Fy);
 		dist[8*Np+n] = fq;
 
 		// q = 9
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx-jy)+0.025*(m4-m6)
-//                                                								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//                                                								+mrt_V12*m12-0.25*m13+0.125*(m16+m17) + 0.08333333333*(Fx-Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx-jy)+0.025*(m4-m6)
                                                 								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-                                                								+mrt_V12*m12-0.25*m13+0.125*(m16+m17);
+                                                								+mrt_V12*m12-0.25*m13+0.125*(m16+m17) + 0.08333333333*(Fx-Fy);
 		dist[9*Np+n] = fq;
 
 		// q = 10
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jy-jx)+0.025*(m6-m4)
-//                                                								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//                                                								+mrt_V12*m12-0.25*m13-0.125*(m16+m17)- 0.08333333333*(Fx-Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jy-jx)+0.025*(m6-m4)
                                                 								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-                                                								+mrt_V12*m12-0.25*m13-0.125*(m16+m17);
+                                                								+mrt_V12*m12-0.25*m13-0.125*(m16+m17)- 0.08333333333*(Fx-Fy);
 		dist[10*Np+n] = fq;
 
 
 		// q = 11
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jx+jz)+0.025*(m4+m8)
-//				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//				-mrt_V12*m12+0.25*m15+0.125*(m18-m16) + 0.08333333333*(Fx+Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jx+jz)+0.025*(m4+m8)
 				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-				-mrt_V12*m12+0.25*m15+0.125*(m18-m16);
+				-mrt_V12*m12+0.25*m15+0.125*(m18-m16) + 0.08333333333*(Fx+Fz);
 		dist[11*Np+n] = fq;
 
 		// q = 12
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jz)-0.025*(m4+m8)
-//                                        								+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//                                        								-mrt_V12*m12+0.25*m15+0.125*(m16-m18) - 0.08333333333*(Fx+Fz);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jz)-0.025*(m4+m8)
                                         								+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-                                        								-mrt_V12*m12+0.25*m15+0.125*(m16-m18);
+                                        								-mrt_V12*m12+0.25*m15+0.125*(m16-m18) - 0.08333333333*(Fx+Fz);
 		dist[12*Np+n] = fq;
 
 		// q = 13
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jx-jz)+0.025*(m4-m8)
-//				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//				-mrt_V12*m12-0.25*m15-0.125*(m16+m18) + 0.08333333333*(Fx-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jx-jz)+0.025*(m4-m8)
 				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-				-mrt_V12*m12-0.25*m15-0.125*(m16+m18);
+				-mrt_V12*m12-0.25*m15-0.125*(m16+m18) + 0.08333333333*(Fx-Fz);
 		dist[13*Np+n] = fq;
 
 		// q= 14
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jz-jx)+0.025*(m8-m4)
-//				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//				-mrt_V12*m12-0.25*m15+0.125*(m16+m18) - 0.08333333333*(Fx-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jz-jx)+0.025*(m8-m4)
 				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-				-mrt_V12*m12-0.25*m15+0.125*(m16+m18);
+				-mrt_V12*m12-0.25*m15+0.125*(m16+m18) - 0.08333333333*(Fx-Fz);
 
 		dist[14*Np+n] = fq;
 
 		// q = 15
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jy+jz)+0.025*(m6+m8)
-//				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m17-m18) + 0.08333333333*(Fy+Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jy+jz)+0.025*(m6+m8)
-				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m17-m18);
+				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m17-m18) + 0.08333333333*(Fy+Fz);
 		dist[15*Np+n] = fq;
 
 		// q = 16
-//		fq =  mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2-0.1*(jy+jz)-0.025*(m6+m8)
-//				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m18-m17)- 0.08333333333*(Fy+Fz);
 		fq =  mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2-0.1*(jy+jz)-0.025*(m6+m8)
-				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m18-m17);
+				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m18-m17)- 0.08333333333*(Fy+Fz);
 		dist[16*Np+n] = fq;
 
 
 		// q = 17
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jy-jz)+0.025*(m6-m8)
-//				-mrt_V6*m9-mrt_V7*m10-0.25*m14+0.125*(m17+m18) + 0.08333333333*(Fy-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jy-jz)+0.025*(m6-m8)
-				-mrt_V6*m9-mrt_V7*m10-0.25*m14+0.125*(m17+m18);
+				-mrt_V6*m9-mrt_V7*m10-0.25*m14+0.125*(m17+m18) + 0.08333333333*(Fy-Fz);
 		dist[17*Np+n] = fq;
 
 		// q = 18
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jz-jy)+0.025*(m8-m6)
-//				-mrt_V6*m9-mrt_V7*m10-0.25*m14-0.125*(m17+m18) - 0.08333333333*(Fy-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jz-jy)+0.025*(m8-m6)
-				-mrt_V6*m9-mrt_V7*m10-0.25*m14-0.125*(m17+m18);
+				-mrt_V6*m9-mrt_V7*m10-0.25*m14-0.125*(m17+m18) - 0.08333333333*(Fy-Fz);
 		dist[18*Np+n] = fq;
 
 		//........................................................................
@@ -1726,36 +1657,11 @@ extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist, int star
 
 		//..............incorporate external force................................................
 		//..............carry out relaxation process...............................................
-//		m1 = m1 + rlx_setA*((19*(jx*jx+jy*jy+jz*jz)/rho - 11*rho) - m1);
-//		m2 = m2 + rlx_setA*((3*rho - 5.5*(jx*jx+jy*jy+jz*jz)/rho) - m2);
-//		m4 = m4 + rlx_setB*((-0.6666666666666666*jx) - m4);
-//		m6 = m6 + rlx_setB*((-0.6666666666666666*jy) - m6);
-//		m8 = m8 + rlx_setB*((-0.6666666666666666*jz) - m8);
-//		m9 = m9 + rlx_setA*(((2*jx*jx-jy*jy-jz*jz)/rho) - m9);
-//		m10 = m10 + rlx_setA*(-0.5*((2*jx*jx-jy*jy-jz*jz)/rho) - m10);
-//		m11 = m11 + rlx_setA*(((jy*jy-jz*jz)/rho) - m11);
-//		m12 = m12 + rlx_setA*(-0.5*((jy*jy-jz*jz)/rho) - m12);
-//		m13 = m13 + rlx_setA*((jx*jy/rho) - m13);
-//		m14 = m14 + rlx_setA*((jy*jz/rho) - m14);
-//		m15 = m15 + rlx_setA*((jx*jz/rho) - m15);
-//		m16 = m16 + rlx_setB*( - m16);
-//		m17 = m17 + rlx_setB*( - m17);
-//		m18 = m18 + rlx_setB*( - m18);
-
-        //Body force is executed in the moment space
-		m1 = m1 + rlx_setA*((19*(jx*jx+jy*jy+jz*jz)/rho - 11*rho) - m1)
-                + (1-0.5*rlx_setA)*38*(Fx*jx+Fy*jy+Fz*jz)/rho;
-		m2 = m2 + rlx_setA*((3*rho - 5.5*(jx*jx+jy*jy+jz*jz)/rho) - m2)
-                + (1-0.5*rlx_setA)*11*(-Fx*jx-Fy*jy-Fz*jz)/rho;
-        jx = jx + Fx;
-		m4 = m4 + rlx_setB*((-0.6666666666666666*jx) - m4)
-                + (1-0.5*rlx_setB)*(-0.6666666666666666*Fx);
-        jy = jy + Fy;
-		m6 = m6 + rlx_setB*((-0.6666666666666666*jy) - m6)
-                + (1-0.5*rlx_setB)*(-0.6666666666666666*Fy);
-        jz = jz + Fz;
-		m8 = m8 + rlx_setB*((-0.6666666666666666*jz) - m8)
-                + (1-0.5*rlx_setB)*(-0.6666666666666666*Fz);
+		m1 = m1 + rlx_setA*((19*(jx*jx+jy*jy+jz*jz)/rho - 11*rho) - m1);
+		m2 = m2 + rlx_setA*((3*rho - 5.5*(jx*jx+jy*jy+jz*jz)/rho) - m2);
+		m4 = m4 + rlx_setB*((-0.6666666666666666*jx) - m4);
+		m6 = m6 + rlx_setB*((-0.6666666666666666*jy) - m6);
+		m8 = m8 + rlx_setB*((-0.6666666666666666*jz) - m8);
 		m9 = m9 + rlx_setA*(((2*jx*jx-jy*jy-jz*jz)/rho) - m9);
 		m10 = m10 + rlx_setA*(-0.5*((2*jx*jx-jy*jy-jz*jz)/rho) - m10);
 		m11 = m11 + rlx_setA*(((jy*jy-jz*jz)/rho) - m11);
@@ -1766,7 +1672,6 @@ extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist, int star
 		m16 = m16 + rlx_setB*( - m16);
 		m17 = m17 + rlx_setB*( - m17);
 		m18 = m18 + rlx_setB*( - m18);
-
 		//.......................................................................................................
 		//.................inverse transformation......................................................
 
@@ -1775,164 +1680,120 @@ extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist, int star
 		dist[n] = fq;
 
 		// q = 1
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jx-m4)+mrt_V6*(m9-m10)+0.16666666*Fx;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jx-m4)+mrt_V6*(m9-m10);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jx-m4)+mrt_V6*(m9-m10)+0.16666666*Fx;
 		nread = neighborList[n+Np];
 		dist[nread] = fq;
 
 		// q=2
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m4-jx)+mrt_V6*(m9-m10) -  0.16666666*Fx;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m4-jx)+mrt_V6*(m9-m10);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m4-jx)+mrt_V6*(m9-m10) -  0.16666666*Fx;
 		nread = neighborList[n];
 		dist[nread] = fq;
 
 		// q = 3
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jy-m6)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) + 0.16666666*Fy;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jy-m6)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jy-m6)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) + 0.16666666*Fy;
 		nread = neighborList[n+3*Np];
 		dist[nread] = fq;
 
 		// q = 4
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m6-jy)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) - 0.16666666*Fy;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m6-jy)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m6-jy)+mrt_V7*(m10-m9)+mrt_V8*(m11-m12) - 0.16666666*Fy;
 		nread = neighborList[n+2*Np];
 		dist[nread] = fq;
 
 		// q = 5
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jz-m8)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) + 0.16666666*Fz;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jz-m8)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(jz-m8)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) + 0.16666666*Fz;
 		nread = neighborList[n+5*Np];
 		dist[nread] = fq;
 
 		// q = 6
-		//fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m8-jz)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) - 0.16666666*Fz;
-		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m8-jz)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11);
+		fq = mrt_V1*rho-mrt_V4*m1-mrt_V5*m2+0.1*(m8-jz)+mrt_V7*(m10-m9)+mrt_V8*(m12-m11) - 0.16666666*Fz;
 		nread = neighborList[n+4*Np];
 		dist[nread] = fq;
 
 		// q = 7
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx+jy)+0.025*(m4+m6)
-//                                                								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//                                                								+mrt_V12*m12+0.25*m13+0.125*(m16-m17) + 0.08333333333*(Fx+Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx+jy)+0.025*(m4+m6)
                                                 								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-                                                								+mrt_V12*m12+0.25*m13+0.125*(m16-m17);
+                                                								+mrt_V12*m12+0.25*m13+0.125*(m16-m17) + 0.08333333333*(Fx+Fy);
 		nread = neighborList[n+7*Np];
 		dist[nread] = fq;
 
 		// q = 8
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jy)-0.025*(m4+m6) +mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//				+mrt_V12*m12+0.25*m13+0.125*(m17-m16) - 0.08333333333*(Fx+Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jy)-0.025*(m4+m6) +mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-				+mrt_V12*m12+0.25*m13+0.125*(m17-m16);
+				+mrt_V12*m12+0.25*m13+0.125*(m17-m16) - 0.08333333333*(Fx+Fy);
 		nread = neighborList[n+6*Np];
 		dist[nread] = fq;
 
 		// q = 9
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx-jy)+0.025*(m4-m6)
-//                                                								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//                                                								+mrt_V12*m12-0.25*m13+0.125*(m16+m17) + 0.08333333333*(Fx-Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jx-jy)+0.025*(m4-m6)
                                                 								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-                                                								+mrt_V12*m12-0.25*m13+0.125*(m16+m17);
+                                                								+mrt_V12*m12-0.25*m13+0.125*(m16+m17) + 0.08333333333*(Fx-Fy);
 		nread = neighborList[n+9*Np];
 		dist[nread] = fq;
 
 		// q = 10
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jy-jx)+0.025*(m6-m4)
-//                                                								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-//                                                								+mrt_V12*m12-0.25*m13-0.125*(m16+m17)- 0.08333333333*(Fx-Fy);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2+0.1*(jy-jx)+0.025*(m6-m4)
                                                 								+mrt_V7*m9+mrt_V11*m10+mrt_V8*m11
-                                                								+mrt_V12*m12-0.25*m13-0.125*(m16+m17);
+                                                								+mrt_V12*m12-0.25*m13-0.125*(m16+m17)- 0.08333333333*(Fx-Fy);
 		nread = neighborList[n+8*Np];
 		dist[nread] = fq;
 
 		// q = 11
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jx+jz)+0.025*(m4+m8)
-//				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//				-mrt_V12*m12+0.25*m15+0.125*(m18-m16) + 0.08333333333*(Fx+Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jx+jz)+0.025*(m4+m8)
 				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-				-mrt_V12*m12+0.25*m15+0.125*(m18-m16);
+				-mrt_V12*m12+0.25*m15+0.125*(m18-m16) + 0.08333333333*(Fx+Fz);
 		nread = neighborList[n+11*Np];
 		dist[nread] = fq;
 
 		// q = 12
-//		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jz)-0.025*(m4+m8)
-//                                        								+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//                                        								-mrt_V12*m12+0.25*m15+0.125*(m16-m18) - 0.08333333333*(Fx+Fz);
 		fq = mrt_V1*rho+mrt_V9*m1+mrt_V10*m2-0.1*(jx+jz)-0.025*(m4+m8)
                                         								+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-                                        								-mrt_V12*m12+0.25*m15+0.125*(m16-m18);
+                                        								-mrt_V12*m12+0.25*m15+0.125*(m16-m18) - 0.08333333333*(Fx+Fz);
 		nread = neighborList[n+10*Np];
 		dist[nread]= fq;
 
 		// q = 13
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jx-jz)+0.025*(m4-m8)
-//				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//				-mrt_V12*m12-0.25*m15-0.125*(m16+m18) + 0.08333333333*(Fx-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jx-jz)+0.025*(m4-m8)
 				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-				-mrt_V12*m12-0.25*m15-0.125*(m16+m18);
+				-mrt_V12*m12-0.25*m15-0.125*(m16+m18) + 0.08333333333*(Fx-Fz);
 		nread = neighborList[n+13*Np];
 		dist[nread] = fq;
 
 		// q= 14
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jz-jx)+0.025*(m8-m4)
-//				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-//				-mrt_V12*m12-0.25*m15+0.125*(m16+m18) - 0.08333333333*(Fx-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jz-jx)+0.025*(m8-m4)
 				+mrt_V7*m9+mrt_V11*m10-mrt_V8*m11
-				-mrt_V12*m12-0.25*m15+0.125*(m16+m18);
+				-mrt_V12*m12-0.25*m15+0.125*(m16+m18) - 0.08333333333*(Fx-Fz);
 		nread = neighborList[n+12*Np];
 		dist[nread] = fq;
 
 
 		// q = 15
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jy+jz)+0.025*(m6+m8)
-//				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m17-m18) + 0.08333333333*(Fy+Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jy+jz)+0.025*(m6+m8)
-				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m17-m18);
+				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m17-m18) + 0.08333333333*(Fy+Fz);
 		nread = neighborList[n+15*Np];
 		dist[nread] = fq;
 
 		// q = 16
-//		fq =  mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2-0.1*(jy+jz)-0.025*(m6+m8)
-//				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m18-m17)- 0.08333333333*(Fy+Fz);
 		fq =  mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2-0.1*(jy+jz)-0.025*(m6+m8)
-				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m18-m17);
+				-mrt_V6*m9-mrt_V7*m10+0.25*m14+0.125*(m18-m17)- 0.08333333333*(Fy+Fz);
 		nread = neighborList[n+14*Np];
 		dist[nread] = fq;
 
 
 		// q = 17
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jy-jz)+0.025*(m6-m8)
-//				-mrt_V6*m9-mrt_V7*m10-0.25*m14+0.125*(m17+m18) + 0.08333333333*(Fy-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jy-jz)+0.025*(m6-m8)
-				-mrt_V6*m9-mrt_V7*m10-0.25*m14+0.125*(m17+m18);
+				-mrt_V6*m9-mrt_V7*m10-0.25*m14+0.125*(m17+m18) + 0.08333333333*(Fy-Fz);
 		nread = neighborList[n+17*Np];
 		dist[nread] = fq;
 
 		// q = 18
-//		fq = mrt_V1*rho+mrt_V9*m1
-//				+mrt_V10*m2+0.1*(jz-jy)+0.025*(m8-m6)
-//				-mrt_V6*m9-mrt_V7*m10-0.25*m14-0.125*(m17+m18) - 0.08333333333*(Fy-Fz);
 		fq = mrt_V1*rho+mrt_V9*m1
 				+mrt_V10*m2+0.1*(jz-jy)+0.025*(m8-m6)
-				-mrt_V6*m9-mrt_V7*m10-0.25*m14-0.125*(m17+m18);
+				-mrt_V6*m9-mrt_V7*m10-0.25*m14-0.125*(m17+m18) - 0.08333333333*(Fy-Fz);
 		nread = neighborList[n+16*Np];
 		dist[nread] = fq;