Updates, new regexes