Changing logic for discover