July 16 :  convert to angularjs