updated regex match