Update both of these if found, not either/or