added a slightly better search