v 1.2
moved to directives