Reworked directive