changed regex a bit