July 17:  convert to angularjs