added numers and regexp