I think I have fixed a regex issue, not sure yet...test