edits from training class
putting directives into the mix