Updating for release 2.10
Get rid of the regex.