changed my regex a bit