tweak regexs take two :)