improvements
double search!