Added better number matching