part of search, improved migration