Modified Search to better suite things