more consolidation of directives