Added a small part of the search back in.