new directives and changes to order and calendar