rewrote the regex to be much simpler