diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index a0fa6a9660..8d5e0f9647 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -38,8 +38,9 @@ const short JITTER_BUFFER_SAMPLES = JITTER_BUFFER_LENGTH_MSECS * (SAMPLE_RATE /
 const short NUM_AUDIO_SOURCES = 2;
 const short ECHO_SERVER_TEST = 1;
 
-char WORKCLUB_AUDIO_SERVER[] = "192.168.1.19";
-char EC2_WEST_AUDIO_SERVER[] = "54.241.92.53";
+char LOCALHOST_MIXER[] = "0.0.0.0";
+char WORKCLUB_MIXER[] = "192.168.1.19";
+char EC2_WEST_MIXER[] = "54.241.92.53";
 
 const int AUDIO_UDP_LISTEN_PORT = 55444;
 
@@ -88,7 +89,7 @@ int audioCallback (const void *inputBuffer,
 //    int16_t *inputRight = ((int16_t **) inputBuffer)[1];
     
     if (inputLeft != NULL) {
-        data->audioSocket->send((char *) EC2_WEST_AUDIO_SERVER, 55443, (void *)inputLeft, BUFFER_LENGTH_BYTES);
+        data->audioSocket->send((char *) EC2_WEST_MIXER, 55443, (void *)inputLeft, BUFFER_LENGTH_BYTES);
         //
         //  Measure the loudness of the signal from the microphone and store in audio object
         //
diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp
index 9dce08fc94..c9efe24b93 100644
--- a/mixer/src/main.cpp
+++ b/mixer/src/main.cpp
@@ -171,12 +171,10 @@ void *sendBuffer(void *args)
                 }
 
                 for(int as = 0; as < BUFFER_LENGTH_SAMPLES; as++) {
-//                    long longSample = previousOutput != NULL 
-//                        ? masterMix[as] - previousOutput[as]
-//                        : masterMix[as];
+                    long longSample = previousOutput != NULL 
+                        ? masterMix[as] - previousOutput[as]
+                        : masterMix[as];
 
-                    long longSample = masterMix[as];
-    
                     int16_t shortSample;
                     
                     if (longSample < 0) {