switched to angularJS