changed the regexp and require style