beefing up search, I think