After changes to allow for commas.