Switched to AngularJS