Added some search and order