Directive made more efficient