brutal addition of solo-search stuff