massive changes to search