Changed do regular expresions