update 2.0 to support angular.js