remove search until I find a good way to implement