Changing to ng-validation