diff --git a/Source/AudioSource.cpp b/Source/AudioSource.cpp
index cebdc9afb5..90955ed274 100644
--- a/Source/AudioSource.cpp
+++ b/Source/AudioSource.cpp
@@ -10,23 +10,22 @@
 
 AudioSource::~AudioSource()
 {
-    delete oldestData;
-    delete newestData;
+     delete[] sourceData;
 }
 
 
 int AudioSource::loadDataFromFile(const char *filename) {
-//    FILE *soundFile = fopen(filename, "r");
-//    
-//    // get length of file:
-//    std::fseek(soundFile, 0, SEEK_END);
-//    lengthInSamples = std::ftell(soundFile) / sizeof(int16_t);
-//    std::rewind(soundFile);
-//    
-//    sourceData = new int16_t[lengthInSamples];
-//    std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
-//    
-//    std::fclose(soundFile);
-//    
+    FILE *soundFile = fopen(filename, "r");
+    
+    // get length of file:
+    std::fseek(soundFile, 0, SEEK_END);
+    lengthInSamples = std::ftell(soundFile) / sizeof(int16_t);
+    std::rewind(soundFile);
+    
+    sourceData = new int16_t[lengthInSamples];
+    std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
+    
+    std::fclose(soundFile);
+    
     return 0;
 }
\ No newline at end of file
diff --git a/Source/AudioSource.h b/Source/AudioSource.h
index 20a00ca7da..adb68c3df4 100644
--- a/Source/AudioSource.h
+++ b/Source/AudioSource.h
@@ -15,19 +15,11 @@
 class AudioSource {
     public:
         glm::vec3 position;
-    
-        struct JitterBuffer {
-            int16_t *audioData;
-            timeval receiveTime;
-            
-            ~JitterBuffer() { delete[] audioData; }
-        } *oldestData, *newestData;
-    
-//        int lengthInSamples;
-//        int samplePointer;
-    
-//        AudioSource() { samplePointer = 0; lengthInSamples = 0; }
-        AudioSource() { oldestData = NULL; newestData = NULL; }
+        int16_t *sourceData;
+        int lengthInSamples;
+        int samplePointer;
+        
+        AudioSource() { samplePointer = 0; sourceData = NULL; }
         ~AudioSource();
         
         int loadDataFromFile(const char *filename);