improved regex; changed Directive contract; modified OrigDirective;