added two more rules to the regex