removed ngs from macros, updated accumulator