#4 removed old code, prepared new search