don't forget to use your new regex here, the one that handles "." and "-"