refactor of 1.3 demo
directive with correct variables