diff --git a/revid/RevidInstance.go b/revid/RevidInstance.go
index a6bf9fb6..b4835147 100644
--- a/revid/RevidInstance.go
+++ b/revid/RevidInstance.go
@@ -60,7 +60,7 @@ const (
 	mp2tPacketSize        = 188                 // MPEG-TS packet size
 	mp2tMaxPackets        = 2016 * clipDuration // # first multiple of 7 and 8 greater than 2000
 	ringBufferSize        = 10000
-	ringBufferElementSize = 100000
+	ringBufferElementSize = 10000
 	maxClipSize           = 10000
 	httpTimeOut           = 5 // s
 	packetsPerFrame       = 7
@@ -315,7 +315,11 @@ func (r *revidInst) outputClips() {
 	for r.isRunning {
 		// Here we slow things down as much as we can to decrease cpu usage
 		switch {
+<<<<<<< HEAD
 		case r.ringBuffer.GetNoOfElements() < 200:
+=======
+		case r.ringBuffer.GetNoOfElements() < 2:
+>>>>>>> 2eae228d739eec6c71ac204250b980cc1c158a91
 			delay++
 			time.Sleep(time.Duration(delay) * time.Millisecond)
 		case delay > 0:
@@ -461,8 +465,8 @@ func (r *revidInst) setupInputForRaspivid() error {
 			"-o", "-",
 			"-n",
 			"-t", r.config.Timeout,
-			"-b", r.config.Bitrate,
-			"-qp", r.config.Quantization,
+			"-b", 10000,
+			//"-qp", r.config.Quantization,
 			"-w", r.config.Width,
 			"-h", r.config.Height,
 			"-fps", r.config.FrameRate,