Added blink detection
merge