refactored to directives