more modifications to the directives; everything is working with them!