Updated RegEx