update to use macros from angular.cl2