imporoved regexs