Further Modified AngularJS