changed regexp way of use