#32 updating deprecated method and restoring previous regex rules