diff --git a/common/TwoPhase.cpp b/common/TwoPhase.cpp
index ae53cb63..a8ffdcea 100644
--- a/common/TwoPhase.cpp
+++ b/common/TwoPhase.cpp
@@ -179,7 +179,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
 {
 	double factor,temp,value;
 	factor=0.5/Beta;
-	// Initialize to -1,1 (segmentation)
+	/*	// Initialize to -1,1 (segmentation)
 	for (int k=0; k<Nz; k++){
 		for (int j=0; j<Ny; j++){
 			for (int i=0; i<Nx; i++){
@@ -190,15 +190,17 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
 				if (value > 0)	TempID[n] = 1;
 				else			TempID[n] = 0;
 
-			 	temp = factor*log((1.0+value)/(1.0-value));
-			 	if (value > 0.8) DistData(i,j,k) = 2.94*factor;
-			 	else if (value < -0.8) DistData(i,j,k) = -2.94*factor;
-			 	else DistData(i,j,k) = temp;
+			 	//temp = factor*log((1.0+value)/(1.0-value));
+			 	//if (value > 0.8) DistData(i,j,k) = 2.94*factor;
+			 	//else if (value < -0.8) DistData(i,j,k) = -2.94*factor;
+			 	//else DistData(i,j,k) = temp;
 
 				// Basic threshold
-				if (value > 0) DistData(i,j,k) = 1.0;
-				else DistData(i,j,k) = -1.0;
-
+				//if (value > 0) DistData(i,j,k) = 1.0;
+				//else DistData(i,j,k) = -1.0;
+				
+				// Initialize directly
+				DistData(i,j,k) = value;
 			}
 		}
 	}
@@ -208,19 +210,19 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
     for (int k=0; k<Nz; k++){
 	  for (int j=0; j<Ny; j++){
 	    for (int i=0; i<Nx; i++){
-	      DistData(i,j,k) -= 1.0;
+	      DistData(i,j,k) += 1.5;
 	    }
 	  }
 	}	
-        /*
-		for (int k=0; k<Nz; k++){
+        */
+	  for (int k=0; k<Nz; k++){
 		for (int j=0; j<Ny; j++){
 			for (int i=0; i<Nx; i++){
 				DistData(i,j,k) = ColorData(i,j,k);
 			}
 		}
 	}
-*/
+
 //	for (int n=0; n<Nx*Ny*Nz; n++)	DistData[n] = ColorData[n];
 }
 
diff --git a/tests/lbpm_color_simulator.cpp b/tests/lbpm_color_simulator.cpp
index c078aefb..7d6da1a4 100644
--- a/tests/lbpm_color_simulator.cpp
+++ b/tests/lbpm_color_simulator.cpp
@@ -578,7 +578,7 @@ int main(int argc, char **argv)
 	MPI_Barrier(comm);
 	//.......................................................................
 	// Once phase has been initialized, map solid to account for 'smeared' interface
-	// for (i=0; i<N; i++)	Averages->SDs(i) -= (1.0); //
+	for (i=0; i<N; i++)	Averages->SDs(i) -= (1.0); //
 	//.......................................................................
 	// Finalize setup for averaging domain
 	//Averages->SetupCubes(Dm);
@@ -910,13 +910,13 @@ int main(int argc, char **argv)
 */
     
 /*	Averages->WriteSurfaces(0);
-
+ */
 	sprintf(LocalRankFilename,"%s%s","Phase.",LocalRankString);
 	FILE *PHASE;
 	PHASE = fopen(LocalRankFilename,"wb");
 	fwrite(Averages->SDn.get(),8,N,PHASE);
 	fclose(PHASE);
-*/
+	/**/
 
 	/*	sprintf(LocalRankFilename,"%s%s","Pressure.",LocalRankString);
 	FILE *PRESS;