FIX::improve gesture detection