Making changes to how invites are handled to account for multiple invites