diff --git a/titles/mai2/buddiesplus.py b/titles/mai2/buddiesplus.py
index fc0bcfb..6ed0025 100644
--- a/titles/mai2/buddiesplus.py
+++ b/titles/mai2/buddiesplus.py
@@ -75,10 +75,10 @@ class Mai2BuddiesPlus(Mai2Buddies):
         user1rivalList = await self.data.profile.get_rivals(data["userId1"]) or []
         user2rivalList = await self.data.profile.get_rivals(data["userId2"]) or []
 
-        is_user2_in_user1_rivals = any(rival["rival"] == data["userId2"] for rival in user1rivalList)
-        is_user1_in_user2_rivals = any(rival["rival"] == data["userId1"] for rival in user2rivalList)
-        user1_show_count = sum(1 for rival in user1rivalList if rival.get("show") == 1)
-        user2_show_count = sum(1 for rival in user2rivalList if rival.get("show") == 1)
+        is_user2_in_user1_rivals = any(row.rival == data["userId2"] for row in user1rivalList)
+        is_user1_in_user2_rivals = any(row.rival == data["userId1"] for row in user2rivalList)
+        user1_show_count = sum(1 for row in user1rivalList if row.show is True)
+        user2_show_count = sum(1 for row in user2rivalList if row.show is True)
 
         # initialize returnCode
         returnCode1 = 2
@@ -95,20 +95,12 @@ class Mai2BuddiesPlus(Mai2Buddies):
 
         # Case2 has single rival
         elif is_user2_in_user1_rivals != is_user1_in_user2_rivals:
-            if is_user2_in_user1_rivals and not is_user1_in_user2_rivals:
-                if user1_show_count >= 3 and user2_show_count >= 3:
-                    returnCode1, returnCode2 = 1, 1
-                elif user1_show_count >= 3:
-                    returnCode1, returnCode2 = 1, 2
-                elif user2_show_count >= 3:
-                    returnCode1, returnCode2 = 2, 1
-            else:
-                if user1_show_count >= 3 and user2_show_count >= 3:
-                    returnCode1, returnCode2 = 1, 1
-                elif user1_show_count >= 3:
-                    returnCode1, returnCode2 = 1, 2
-                elif user2_show_count >= 3:
-                    returnCode1, returnCode2 = 2, 1
+            if user1_show_count >= 3 and user2_show_count >= 3:
+                returnCode1, returnCode2 = 1, 1
+            elif user1_show_count >= 3:
+                returnCode1, returnCode2 = 1, 2
+            elif user2_show_count >= 3:
+                returnCode1, returnCode2 = 2, 1
 
         # execute add_rival and show_rival
         if not is_user2_in_user1_rivals: