Regex update, not finished yet