updated regex