diff --git a/plugins/channel/lora/lorabits.h b/plugins/channel/lora/lorabits.h
index 0f238d897..53bf38276 100644
--- a/plugins/channel/lora/lorabits.h
+++ b/plugins/channel/lora/lorabits.h
@@ -4,7 +4,7 @@
 */
 
 // Needs adjusting for different sizes
-void interleave(short* inout)
+void LoRaDemod::interleave(short* inout)
 {
 	int i, index = 6;
 	short in[index * 2];
@@ -18,10 +18,8 @@ void interleave(short* inout)
 }
 
 // Same sequence for any size
-void make_gray(void)
+void LoRaDemod::make_gray()
 {
-	short gray[1<<8];
-//	short ungray[1<<8];
 	short k = 0;
 	for (short i = 0; i < 1<<8; i++) {
 		gray[i] = k;
diff --git a/plugins/channel/lora/lorademod.cpp b/plugins/channel/lora/lorademod.cpp
index ea70f0720..563cdf4f7 100644
--- a/plugins/channel/lora/lorademod.cpp
+++ b/plugins/channel/lora/lorademod.cpp
@@ -21,7 +21,7 @@
 #include "lorademod.h"
 #include "dsp/dspcommands.h"
 
-//#include "lorabits.h"
+#include "lorabits.h"
 
 MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureLoRaDemod, Message)
 
@@ -45,7 +45,9 @@ LoRaDemod::LoRaDemod(SampleSink* sampleSink) :
 	loraFilter = new sfft(LORA_SFFT_LEN);
 	negaFilter = new sfft(LORA_SFFT_LEN);
 
-	//make_gray();
+	mov = new float[4*LORA_SFFT_LEN];
+	gray = new short[1<<8];
+	make_gray();
 }
 
 LoRaDemod::~LoRaDemod()
@@ -54,6 +56,10 @@ LoRaDemod::~LoRaDemod()
 		delete loraFilter;
 	if (negaFilter)
 		delete negaFilter;
+	if (mov)
+		delete [] mov;
+	if (gray)
+		delete [] gray;
 }
 
 void LoRaDemod::configure(MessageQueue* messageQueue, Real Bandwidth)
@@ -63,19 +69,21 @@ void LoRaDemod::configure(MessageQueue* messageQueue, Real Bandwidth)
 }
 
 
-int  LoRaDemod::detect(Complex c, Complex a)
+int LoRaDemod::detect(Complex c, Complex a)
 {
-	int i, result, negresult;
-	float peak, negpeak;
+	int i, result, negresult, movpoint;
+	float peak, negpeak, tfloat;
 	float mag[LORA_SFFT_LEN];
 	float rev[LORA_SFFT_LEN];
 
 	loraFilter->run(c * a);
 	negaFilter->run(c * conj(a));
-	if (++m_count & 31)
-		return m_result;
 
-	// process spectrum every 32 samples
+	// process spectrum twice in FFTLEN
+	if (++m_count & ((1 << DATA_BITS) - 1))
+		return m_result;
+	movpoint = 3 & (m_count >> DATA_BITS);
+
 	loraFilter->fetch(mag);
 	negaFilter->fetch(rev);
 	peak = negpeak = 0.0f;
@@ -85,10 +93,13 @@ int  LoRaDemod::detect(Complex c, Complex a)
 			negpeak = rev[i];
 			negresult = i;
 		}
-		if (mag[i] > peak) {
-			peak = mag[i];
+		tfloat = mov[i] + mov[LORA_SFFT_LEN + i] +mov[2 * LORA_SFFT_LEN + i]
+				+ mov[3 * LORA_SFFT_LEN + i] + mag[i];
+		if (tfloat > peak) {
+			peak = tfloat;
 			result = i;
 		}
+		mov[movpoint * LORA_SFFT_LEN + i] = mag[i];
 	}
 	if (peak > negpeak) {
 		m_result = result;
diff --git a/plugins/channel/lora/lorademod.h b/plugins/channel/lora/lorademod.h
index db2c029c3..7d5454369 100644
--- a/plugins/channel/lora/lorademod.h
+++ b/plugins/channel/lora/lorademod.h
@@ -38,12 +38,14 @@ public:
 	void configure(MessageQueue* messageQueue, Real Bandwidth);
 
 	void feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool pO);
-	int  detect(Complex sample, Complex angle);
 	void start();
 	void stop();
 	bool handleMessage(Message* cmd);
 
 private:
+	int  detect(Complex sample, Complex angle);
+	void interleave(short* inout);
+	void make_gray();
 	class MsgConfigureLoRaDemod : public Message {
 		MESSAGE_CLASS_DECLARATION
 
@@ -77,6 +79,8 @@ private:
 
 	sfft* loraFilter;
 	sfft* negaFilter;
+	float* mov;
+	short* gray;
 
 	NCO m_nco;
 	Interpolator m_interpolator;