Final regex update