untested fix of the searche
import
restructure
junk