shifted to angularjs