Updated how ti handles multiples