changed regex a bit more