Switched over to AngularJS