making search, needs improvement