added regexs