rewrote the regex