diff --git a/src/CubicSDRDefs.h b/src/CubicSDRDefs.h
index d54cf73..7a8bb8e 100644
--- a/src/CubicSDRDefs.h
+++ b/src/CubicSDRDefs.h
@@ -11,3 +11,25 @@
 
 #define DEFAULT_FREQ 98900000
 #define AUDIO_FREQUENCY 44100
+
+#include <mutex>
+#include <atomic>
+
+class ReferenceCounter {
+public:
+    mutable std::mutex m_mutex;
+
+    void setRefCount(int rc) {
+        refCount.store(rc);
+    }
+
+    void decRefCount() {
+        refCount.store(refCount.load()-1);
+    }
+
+    int getRefCount() {
+        return refCount.load();
+    }
+protected:
+    std::atomic<int> refCount;
+};
diff --git a/src/audio/AudioThread.h b/src/audio/AudioThread.h
index 3082f21..444e9c0 100644
--- a/src/audio/AudioThread.h
+++ b/src/audio/AudioThread.h
@@ -18,11 +18,12 @@
 #include "RtAudio.h"
 #include "DemodDefs.h"
 
-class AudioThreadInput {
+class AudioThreadInput: public ReferenceCounter  {
 public:
     int frequency;
     int sampleRate;
     int channels;
+    std::vector<float> data;
 
     AudioThreadInput(): frequency(0), sampleRate(0), channels(0) {
 
@@ -31,8 +32,6 @@ public:
     ~AudioThreadInput() {
 
     }
-
-    std::vector<float> data;
 };
 
 class AudioThreadCommand {
diff --git a/src/demod/DemodDefs.h b/src/demod/DemodDefs.h
index 958421d..634268c 100644
--- a/src/demod/DemodDefs.h
+++ b/src/demod/DemodDefs.h
@@ -56,39 +56,23 @@ public:
     DemodulatorThreadControlCommandEnum cmd;
 };
 
-class DemodulatorThreadIQData {
+class DemodulatorThreadIQData : public ReferenceCounter {
 public:
 	unsigned int frequency;
 	unsigned int bandwidth;
 	std::vector<signed char> data;
-    mutable std::mutex m_mutex;
 
 	DemodulatorThreadIQData() :
-			frequency(0), bandwidth(0), refCount(0) {
+			frequency(0), bandwidth(0) {
 
 	}
 
-    void setRefCount(int rc) {
-        refCount.store(rc);
-    }
-
-    void decRefCount() {
-        refCount.store(refCount.load()-1);
-    }
-
-    int getRefCount() {
-        return refCount.load();
-    }
-
 	~DemodulatorThreadIQData() {
 
 	}
-private:
-    std::atomic<int> refCount;
-
 };
 
-class DemodulatorThreadPostIQData {
+class DemodulatorThreadPostIQData : public ReferenceCounter {
 public:
 	std::vector<liquid_float_complex> data;
 	float audio_resample_ratio;
@@ -106,7 +90,7 @@ public:
 };
 
 
-class DemodulatorThreadAudioData {
+class DemodulatorThreadAudioData : public ReferenceCounter {
 public:
 	unsigned int frequency;
 	unsigned int sampleRate;
diff --git a/src/sdr/SDRPostThread.cpp b/src/sdr/SDRPostThread.cpp
index 07b9353..a3aa4ce 100644
--- a/src/sdr/SDRPostThread.cpp
+++ b/src/sdr/SDRPostThread.cpp
@@ -58,6 +58,7 @@ void SDRPostThread::threadMain() {
         SDRThreadIQData *data_in;
 
         iqDataInQueue.load()->pop(data_in);
+//        std::lock_guard < std::mutex > lock(data_in->m_mutex);
 
         if (data_in && data_in->data.size()) {
             SDRThreadIQData *dataOut = new SDRThreadIQData;
@@ -176,9 +177,7 @@ void SDRPostThread::threadMain() {
             }
             delete dataOut;
         }
-        if (data_in) {
-            delete data_in;
-        }
+        data_in->decRefCount();
     }
 
     while (!buffers.empty()) {
diff --git a/src/sdr/SDRThread.cpp b/src/sdr/SDRThread.cpp
index 93dddc4..0d88944 100644
--- a/src/sdr/SDRThread.cpp
+++ b/src/sdr/SDRThread.cpp
@@ -91,7 +91,7 @@ int SDRThread::enumerate_rtl() {
 void SDRThread::threadMain() {
 #ifdef __APPLE__
     pthread_t tID = pthread_self();  // ID of this thread
-    int priority = sched_get_priority_max( SCHED_FIFO )-1;
+    int priority = sched_get_priority_max( SCHED_FIFO) - 1;
     sched_param prio = { priority }; // scheduling priority of thread
     pthread_setschedparam(tID, SCHED_FIFO, &prio);
 #endif
@@ -128,6 +128,10 @@ void SDRThread::threadMain() {
     double seconds = 0.0;
 
     std::cout << "SDR thread started.." << std::endl;
+
+    std::deque<SDRThreadIQData *> buffers;
+    std::deque<SDRThreadIQData *>::iterator buffers_i;
+
     while (!terminated) {
         SDRThreadCommandQueue *cmdQueue = m_pQueue.load();
 
@@ -145,7 +149,7 @@ void SDRThread::threadMain() {
                     freq_changed = true;
                     new_freq = command.int_value;
                     break;
-                    default:
+                default:
                     break;
                 }
             }
@@ -158,12 +162,31 @@ void SDRThread::threadMain() {
 
         rtlsdr_read_sync(dev, buf, BUF_SIZE, &n_read);
 
-        SDRThreadIQData *dataOut = new SDRThreadIQData;
+        SDRThreadIQData *dataOut = NULL;
+
+        for (buffers_i = buffers.begin(); buffers_i != buffers.end(); buffers_i++) {
+            if ((*buffers_i)->getRefCount() <= 0) {
+                dataOut = (*buffers_i);
+                break;
+            }
+        }
+
+        if (dataOut == NULL) {
+            dataOut = new SDRThreadIQData;
+            buffers.push_back(dataOut);
+        }
+
+        std::lock_guard < std::mutex > lock(dataOut->m_mutex);
+        dataOut->setRefCount(1);
         dataOut->frequency = frequency;
         dataOut->bandwidth = bandwidth;
 
+        if (dataOut->data.size() != n_read) {
+            dataOut->data.resize(n_read);
+        }
+
         for (int i = 0; i < n_read; i++) {
-            dataOut->data.push_back(buf[i] - 127);
+            dataOut->data[i] = buf[i] - 127;
         }
 
         double time_slice = (double) n_read / (double) sample_rate;
@@ -173,6 +196,14 @@ void SDRThread::threadMain() {
             iqDataOutQueue.load()->push(dataOut);
         }
     }
+
+    while (!buffers.empty()) {
+        SDRThreadIQData *iqDataDel = buffers.front();
+        buffers.pop_front();
+        std::lock_guard < std::mutex > lock(iqDataDel->m_mutex);
+        delete iqDataDel;
+    }
+
     std::cout << "SDR thread done." << std::endl;
 }
 
diff --git a/src/sdr/SDRThread.h b/src/sdr/SDRThread.h
index b2a59ed..8c9ad26 100644
--- a/src/sdr/SDRThread.h
+++ b/src/sdr/SDRThread.h
@@ -34,7 +34,7 @@ public:
     int int_value;
 };
 
-class SDRThreadIQData {
+class SDRThreadIQData : public ReferenceCounter  {
 public:
     unsigned int frequency;
     unsigned int bandwidth;