updated all regexes