update regex for new needs