Changed regex and updated helpers.