Final Implementation (Minus PartyMode)