Added better search for number