diff --git a/include/blackborder/BlackBorderDetector.h b/include/blackborder/BlackBorderDetector.h
index cd955b8a..14cf051c 100644
--- a/include/blackborder/BlackBorderDetector.h
+++ b/include/blackborder/BlackBorderDetector.h
@@ -62,15 +62,13 @@ namespace hyperion
 		BlackBorder process(const Image<Pixel_T> & image)
 		{
 
-			// only test the topleft third of the image
+			// test center and 1/3, 2/3 of width/heigth
 			int width = image.width() / 3;
 			int height = image.height() / 3;
 			int width2 = width * 2;
 			int height2 = height * 2;
 			int xCenter = image.width() / 2;
 			int yCenter = image.height() / 2;
-//			int maxSize = std::max(width, height);
-
 
 
 			int firstNonBlackXPixelIndex = -1;
@@ -102,55 +100,6 @@ namespace hyperion
 				}
 			}
 
-
-
-/*
-			// only test the topleft third of the image
-			int width = image.width() /3;
-			int height = image.height() / 3;
-			int maxSize = std::max(width, height);
-
-
-
-			int firstNonBlackXPixelIndex = -1;
-			int firstNonBlackYPixelIndex = -1;
-
-			// find some pixel of the image
-			for (int i = 0; i < maxSize; ++i)
-			{
-				int x = std::min(i, width);
-				int y = std::min(i, height);
-
-				const Pixel_T & color = image(x, y);
-				if (!isBlack(color))
-				{
-					firstNonBlackXPixelIndex = x;
-					firstNonBlackYPixelIndex = y;
-					break;
-				}
-			}
-
-			// expand image to the left
-			for(; firstNonBlackXPixelIndex > 0; --firstNonBlackXPixelIndex)
-			{
-				const Pixel_T & color = image(firstNonBlackXPixelIndex-1, firstNonBlackYPixelIndex);
-				if (isBlack(color))
-				{
-					break;
-				}
-			}
-
-			// expand image to the top
-			for(; firstNonBlackYPixelIndex > 0; --firstNonBlackYPixelIndex)
-			{
-				const Pixel_T & color = image(firstNonBlackXPixelIndex, firstNonBlackYPixelIndex-1);
-				if (isBlack(color))
-				{
-					break;
-				}
-			}
-*/
-
 			// Construct result
 			BlackBorder detectedBorder;
 			detectedBorder.unknown = firstNonBlackXPixelIndex == -1 || firstNonBlackYPixelIndex == -1;
diff --git a/include/blackborder/BlackBorderProcessor.h b/include/blackborder/BlackBorderProcessor.h
index ad8c7b83..14be0585 100644
--- a/include/blackborder/BlackBorderProcessor.h
+++ b/include/blackborder/BlackBorderProcessor.h
@@ -73,8 +73,6 @@ namespace hyperion
 		/// @return True if the current border changed else false
 		///
 		bool updateBorder(const BlackBorder & newDetectedBorder);
-		bool updateBorder1(const BlackBorder & newDetectedBorder);
-		bool updateBorder2(const BlackBorder & newDetectedBorder);
 
 		/// The number of unknown-borders detected before it becomes the current border
 		const unsigned _unknownSwitchCnt;
diff --git a/libsrc/blackborder/BlackBorderProcessor.cpp b/libsrc/blackborder/BlackBorderProcessor.cpp
index 28262229..2312da31 100644
--- a/libsrc/blackborder/BlackBorderProcessor.cpp
+++ b/libsrc/blackborder/BlackBorderProcessor.cpp
@@ -51,8 +51,7 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
 	if (newDetectedBorder.unknown)
 	{
 		// apply the unknown border if we consistently can't determine a border
-//		if (_consistentCnt == _unknownSwitchCnt)
-		if (_consistentCnt >= _unknownSwitchCnt)
+		if (_consistentCnt == _unknownSwitchCnt)
 		{
 			_currentBorder = newDetectedBorder;
 			borderChanged = true;
@@ -61,8 +60,7 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
 	else
 	{
 		// apply the detected border if it has been detected consistently
-//		if (_currentBorder.unknown || _consistentCnt == _borderSwitchCnt)
-		if (_currentBorder.unknown || _consistentCnt >= _borderSwitchCnt)
+		if (_currentBorder.unknown || _consistentCnt == _borderSwitchCnt)
 		{
 			_currentBorder = newDetectedBorder;
 			borderChanged = true;
@@ -70,17 +68,16 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
 		else
 		{
 			bool stable = (_consistentCnt >= 10) || (_inconsistentCnt >=30 );
-										//more then A consistent seems like a new size not only a short flicker 
-										//more then B inconsistent seems like the image is changing a lot and we need to set smaller border
-			// apply smaller borders immediately
-//			if (newDetectedBorder.verticalSize < _currentBorder.verticalSize)
-			if ( (newDetectedBorder.verticalSize < _currentBorder.verticalSize) && (stable) )// almost immediatly - avoid switching for "abnormal" frames
+			//more then 10 consistent seems like a new size not only a short flicker 
+			//more then 30 inconsistent seems like the image is changing a lot and we need to set smaller border
+
+			// apply smaller borders (almost) immediately -> avoid switching for "abnormal" frames
+			if ( (newDetectedBorder.verticalSize < _currentBorder.verticalSize) && (stable) )
 			{
 				_currentBorder.verticalSize = newDetectedBorder.verticalSize;
 				borderChanged = true;
 			}
 
-//			if (newDetectedBorder.horizontalSize < _currentBorder.horizontalSize)
 			if ( (newDetectedBorder.horizontalSize < _currentBorder.horizontalSize) && (stable) )
 			{
 				_currentBorder.horizontalSize = newDetectedBorder.horizontalSize;