Updated to include AngularJS