Making changes to invites handling to account for multiple invites