renaming and adding a few directives, not finished
more tests