-Changed some internal group logic.