Updated RegEx with non-capturing group