Changed search method and specs