Change to use Regex.scan and switch regex to need + word or decimal