Changes after consultations. Directives, ng-click etc etc.