More updated regex