regex matching improved.