AFR Regex Update