tweaked regex