Updated with AngularJS