diff --git a/toontown/groups/GroupManager.py b/toontown/groups/GroupManager.py
index 9c1d6ef6..3b5000df 100644
--- a/toontown/groups/GroupManager.py
+++ b/toontown/groups/GroupManager.py
@@ -12,10 +12,10 @@ class GroupManager(DistributedObject.DistributedObject):
         self.shardGroups = {}
         self.groupPlayers = {}
         self.id2type = {
-            SellbotHQ: 'VP Group',
-            CashbotHQ: 'CFO Group',
-            LawbotHQ: 'CJ Group',
-            BossbotHQ: 'CEO Group',
+            SellbotHQ: 'VP',
+            CashbotHQ: 'CFO',
+            LawbotHQ: 'CJ',
+            BossbotHQ: 'CEO',
         }
 
     def announceGenerate(self):
diff --git a/toontown/groups/GroupManagerAI.py b/toontown/groups/GroupManagerAI.py
index 78e52429..6ad926c5 100644
--- a/toontown/groups/GroupManagerAI.py
+++ b/toontown/groups/GroupManagerAI.py
@@ -10,10 +10,10 @@ class GroupManagerAI(DistributedObjectAI.DistributedObjectAI):
 
     def __init__(self, air):
         DistributedObjectAI.DistributedObjectAI.__init__(self, air)
-        self.sellGroup = GlobalGroup('VP Group', SellbotHQ)
-        self.cashGroup = GlobalGroup('CFO Group', CashbotHQ)
-        self.lawGroup  = GlobalGroup('CJ Group', LawbotHQ)
-        self.bossGroup = GlobalGroup('CEO Group', BossbotHQ)
+        self.sellGroup = GlobalGroup('VP', SellbotHQ)
+        self.cashGroup = GlobalGroup('CFO', CashbotHQ)
+        self.lawGroup  = GlobalGroup('CJ', LawbotHQ)
+        self.bossGroup = GlobalGroup('CEO', BossbotHQ)
         self.shardGroups = {
             SellbotHQ: self.sellGroup,
             CashbotHQ: self.cashGroup,
@@ -27,10 +27,10 @@ class GroupManagerAI(DistributedObjectAI.DistributedObjectAI):
             BossbotHQ: [],
         }
         self.id2type = {
-            SellbotHQ: 'VP Group',
-            CashbotHQ: 'CFO Group',
-            LawbotHQ: 'CJ Group',
-            BossbotHQ: 'CEO Group',
+            SellbotHQ: 'VP',
+            CashbotHQ: 'CFO',
+            LawbotHQ: 'CJ',
+            BossbotHQ: 'CEO',
         }
         self.childId = None
 
@@ -67,7 +67,7 @@ class GroupManagerAI(DistributedObjectAI.DistributedObjectAI):
         for groupId, group in self.groupPlayers.items():
             for player in group:
                 toon = simbase.air.doId2do.get(player)
-                if toon.zoneId != groupId:
+                if (toon.zoneId != groupId) or (toon.zoneId + 100 != groupId):
                     self.removePlayerFromGroup(groupId, player)
         return task.again
 
diff --git a/toontown/shtiker/ShardPage.py b/toontown/shtiker/ShardPage.py
index bbf2c878..ee82d3f7 100644
--- a/toontown/shtiker/ShardPage.py
+++ b/toontown/shtiker/ShardPage.py
@@ -365,9 +365,9 @@ class ShardPage(ShtikerPage.ShtikerPage):
             if base.cr.groupManager.isInGroup(base.localAvatar.doId, gid):
                 self.rejectGroup(4)
                 return
-        if len(base.cr.groupManager.getGroupPlayers(groupId)) >= 8:
-            self.rejectGroup(3)
-            return
+        #if len(base.cr.groupManager.getGroupPlayers(groupId)) >= 8:
+        #    self.rejectGroup(3)
+        #    return
         suitIdx = -1
         gids = {10000:0, 11000:1, 12000:2, 13000:3}
         suitIdx = gids.get(groupId)